Merge branch 'helix-editor:master' into pull-diagnostics

helix-editor · Dec 14, 2024 · 1c36972 · 1c36972
2 parents ab117aa + e14c346
commit 1c36972
Show file tree

Hide file tree

Showing 77 changed files with 1,581 additions and 554 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,6 +8,9 @@ on:
   schedule:
     - cron: "00 01 * * *"
 
+env:
+  MSRV: "1.76"
+
 jobs:
   check:
     name: Check (msrv)
@@ -18,7 +21,9 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install MSRV toolchain
-        uses: dtolnay/[email protected]
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ env.MSRV }}
 
       - uses: Swatinem/rust-cache@v2
         with:
@@ -39,7 +44,9 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install MSRV toolchain
-        uses: dtolnay/[email protected]
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ env.MSRV }}
 
       - uses: Swatinem/rust-cache@v2
         with:
@@ -71,8 +78,9 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install MSRV toolchain
-        uses: dtolnay/rust-toolchain@1.76
+        uses: dtolnay/rust-toolchain@master
         with:
+          toolchain: ${{ env.MSRV }}
           components: rustfmt, clippy
 
       - uses: Swatinem/rust-cache@v2
@@ -99,7 +107,9 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install MSRV toolchain
-        uses: dtolnay/[email protected]
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ env.MSRV }}
 
       - uses: Swatinem/rust-cache@v2
         with:

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -16,8 +16,8 @@ jobs:
       - name: Setup mdBook
         uses: peaceiris/actions-mdbook@v2
         with:
-          mdbook-version: 'latest'
-          # mdbook-version: '0.4.8'
+          # mdbook-version: 'latest'
+          mdbook-version: '0.4.43'
 
       - run: mdbook build book