Skip to content

CI: pin rust to 1.61.0 and check MSRV #2529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
archseer merged 4 commits into from
May 23, 2022
Merged

CI: pin rust to 1.61.0 and check MSRV #2529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d6f898c
inherit rust toolchain channel from rust-toolchain.toml
the-mikedavis May 22, 2022
b4d6825
pin the rust toolchain to 1.61.0
the-mikedavis May 22, 2022
dbbea9d
check MSRV in CI
the-mikedavis May 22, 2022
d6d1322
lower MSRV to 1.57.0
the-mikedavis May 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,21 @@ jobs:
check:
name: Check
runs-on: ubuntu-latest
strategy:
matrix:
rust: [stable, msrv]
steps:
- name: Checkout sources
uses: actions/checkout@v3

- name: Use MSRV rust toolchain
if: matrix.rust == 'msrv'
run: cp .github/workflows/msrv-rust-toolchain.toml rust-toolchain.toml

- name: Install stable toolchain
uses: actions-rs/toolchain@v1
uses: helix-editor/rust-toolchain@v1

@pickfire pickfire May 22, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need our own fork?

@the-mikedavis the-mikedavis May 23, 2022

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We merged in actions-rs/toolchain#209 - without it we would need to use the deprecated rust-toolchain file rather than rust-toolchain.toml.

Looks like upstream might be unmaintained at the moment as well but we'll leave #2528 open to switch back if 209 gets merged upstream.

with:
profile: minimal
toolchain: stable
override: true

- uses: Swatinem/rust-cache@v1
Expand All @@ -37,10 +43,9 @@ jobs:
uses: actions/checkout@v3

- name: Install stable toolchain
uses: actions-rs/toolchain@v1
uses: helix-editor/rust-toolchain@v1
with:
profile: minimal
toolchain: ${{ matrix.rust }}
override: true

- uses: Swatinem/rust-cache@v1
Expand All @@ -52,8 +57,8 @@ jobs:
uses: actions/cache@v3
with:
path: runtime/grammars
key: ${{ runner.os }}-v2-tree-sitter-grammars-${{ hashFiles('languages.toml') }}
restore-keys: ${{ runner.os }}-v2-tree-sitter-grammars-
key: ${{ runner.os }}-stable-v${{ env.CACHE_VERSION }}-tree-sitter-grammars-${{ hashFiles('languages.toml') }}
restore-keys: ${{ runner.os }}-stable-v${{ env.CACHE_VERSION }}-tree-sitter-grammars-

- name: Run cargo test
uses: actions-rs/cargo@v1
Expand All @@ -64,7 +69,6 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
rust: [stable]

lints:
name: Lints
Expand All @@ -74,10 +78,9 @@ jobs:
uses: actions/checkout@v3

- name: Install stable toolchain
uses: actions-rs/toolchain@v1
uses: helix-editor/rust-toolchain@v1
with:
profile: minimal
toolchain: stable

@pickfire pickfire May 22, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not run with both stable and the fixed version? That we can make sure helix code can still run on stable in case someone use it.

@the-mikedavis the-mikedavis May 23, 2022

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh yeah we could have smoke tests on stable running on a cron or something. I just don't want it to fail CI for PRs when rust does a release.

override: true
components: rustfmt, clippy

Expand All @@ -103,10 +106,9 @@ jobs:
uses: actions/checkout@v3

- name: Install stable toolchain
uses: actions-rs/toolchain@v1
uses: helix-editor/rust-toolchain@v1
with:
profile: minimal
toolchain: stable
override: true

- uses: Swatinem/rust-cache@v1
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/msrv-rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[toolchain]
channel = "1.57.0"
components = ["rustfmt", "rust-src"]
1 change: 0 additions & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ jobs:
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
override: true

- uses: Swatinem/rust-cache@v1
Expand Down
4 changes: 3 additions & 1 deletion helix-view/src/handlers/dap.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,9 @@ impl Editor {
.arg(arguments.args.join(" "))
.spawn()
.unwrap(),
e => panic!("Error to start debug console: {}", e),
// TODO replace the pretty print {:?} with a regular format {}
// when the MSRV is raised to 1.60.0
e => panic!("Error to start debug console: {:?}", e),
})
} else {
std::process::Command::new("tmux")
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "stable"
channel = "1.61.0"
components = ["rustfmt", "rust-src"]