chore: merge main into nightly-testing

Author: fgdorais

.github/workflows/push-to-nightly.yml

@@ -0,0 +1,31 @@
+# Push every commit to `main` into `nightly-testing`
+
+name: Push to Nightly
+
+on:
+  push:
+    branches: ["main"]
+
+jobs:
+  push-to-nightly:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: checkout repo
+        uses: actions/checkout@v6
+        with:
+          ref: nightly-testing
+          fetch-depth: 0
+          token: ${{ secrets.UNICODE_BASIC_TOKEN }}
+
+      - name: set user
+        run: |
+          git config user.name "${{ github.actor }}"
+          git config user.email "${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com"
+
+      - name: merge main
+        run: |
+          git merge origin/main --no-commit --strategy-option ours --allow-unrelated-histories
+          git restore --staged lean-toolchain lake-manifest.json
+          git commit -m "chore: merge main into nightly-testing"
+          git push origin nightly-testing

.github/workflows/update-nightly.yml …b/workflows/update-nightly-toolchain.yml.github/workflows/update-nightly.yml renamed to .github/workflows/update-nightly-toolchain.yml .github/workflows/update-nightly.yml renamed to .github/workflows/update-nightly-toolchain.yml

@@ -1,9 +1,9 @@
-name: Update Nightly Testing
+name: Update Nightly Toolchain
 
 on:
+  workflow_dispatch:
   schedule:
     - cron: '0 9 * * *'
-  workflow_dispatch:
 
 jobs:
   update:
@@ -22,12 +22,7 @@ jobs:
       - name: set user
         run: |
           git config user.name "${{ github.actor }}"
-          git config user.email "${{ github.actor_id}}+${{ github.actor }}@users.noreply.github.com"
-
-      - name: merge main
-        run: |
-          git fetch origin
-          git merge origin/main --strategy-option ours --no-commit --allow-unrelated-histories
+          git config user.email "${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com"
 
       - name: update lean-toolchain
         id: toolchain-tag