Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
savente93 committed Dec 6, 2024
2 parents adb7658 + 28953ef commit 157f9da
Show file tree
Hide file tree
Showing 227 changed files with 6,818 additions and 1,803 deletions.
30 changes: 22 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ on:
schedule:
- cron: "00 01 * * *"

env:
MSRV: "1.76"

jobs:
check:
name: Check (msrv)
Expand All @@ -16,8 +19,11 @@ jobs:
steps:
- name: Checkout sources
uses: actions/checkout@v4
- name: Install stable toolchain
uses: dtolnay/[email protected]

- name: Install MSRV toolchain
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.MSRV }}

- uses: Swatinem/rust-cache@v2
with:
Expand All @@ -37,8 +43,10 @@ jobs:
- name: Checkout sources
uses: actions/checkout@v4

- name: Install stable toolchain
uses: dtolnay/[email protected]
- name: Install MSRV toolchain
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.MSRV }}

- uses: Swatinem/rust-cache@v2
with:
Expand Down Expand Up @@ -69,9 +77,10 @@ jobs:
- name: Checkout sources
uses: actions/checkout@v4

- name: Install stable toolchain
uses: dtolnay/rust-toolchain@1.70
- name: Install MSRV toolchain
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.MSRV }}
components: rustfmt, clippy

- uses: Swatinem/rust-cache@v2
Expand All @@ -97,8 +106,10 @@ jobs:
- name: Checkout sources
uses: actions/checkout@v4

- name: Install stable toolchain
uses: dtolnay/[email protected]
- name: Install MSRV toolchain
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.MSRV }}

- uses: Swatinem/rust-cache@v2
with:
Expand All @@ -107,6 +118,9 @@ jobs:
- name: Validate queries
run: cargo xtask query-check

- name: Validate themes
run: cargo xtask theme-check

- name: Generate docs
run: cargo xtask docgen

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cachix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
uses: actions/checkout@v4

- name: Install nix
uses: cachix/install-nix-action@V27
uses: cachix/install-nix-action@v30

- name: Authenticate with Cachix
uses: cachix/cachix-action@v15
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ target
helix-term/rustfmt.toml
result
runtime/grammars
.DS_Store
Loading

0 comments on commit 157f9da

Please sign in to comment.