Skip to content

Commit

Permalink
Pin Rust to 1.73
Browse files Browse the repository at this point in the history
  • Loading branch information
flosse committed Dec 2, 2023
1 parent ceb69d1 commit f3470dc
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 40 deletions.
9 changes: 3 additions & 6 deletions .github/workflows/build-and-upload-artifacts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,12 @@ jobs:
run: |
echo "C:\msys64\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
- name: Install Rust toolchains for both native target and WASM
uses: dtolnay/rust-toolchain@master
with:
toolchain: stable
targets: ${{ matrix.target }}, wasm32-unknown-unknown

- name: Check out repository
uses: actions/checkout@v4

- name: Install Rust toolchains for both native target and WASM
uses: dsherret/rust-toolchain-file@v1

- name: Cache Rust toolchain and build artifacts
uses: Swatinem/rust-cache@v2
with:
Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/continuous-integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,12 @@ jobs:
run: |
sudo apt -y install musl-tools
- name: Install Rust toolchains for both native target and WASM
uses: dtolnay/rust-toolchain@master
with:
toolchain: stable
targets: ${{ matrix.target }}, wasm32-unknown-unknown

- name: Check out repository
uses: actions/checkout@v4

- name: Install Rust toolchains for both native target and WASM
uses: dsherret/rust-toolchain-file@v1

- name: Cache Rust toolchain and build artifacts
uses: Swatinem/rust-cache@v2
with:
Expand Down
10 changes: 3 additions & 7 deletions .github/workflows/pre-commit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,12 @@ jobs:
with:
python-version: "3.x"

- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@master
with:
toolchain: stable
components: clippy, rustfmt
targets: wasm32-unknown-unknown

- name: Check out repository
uses: actions/checkout@v4

- name: Install Rust toolchain
uses: dsherret/rust-toolchain-file@v1

- name: Cache Rust toolchain and build artifacts
uses: Swatinem/rust-cache@v2
with:
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/security-audit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,15 @@ jobs:
security-audit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@master
with:
toolchain: stable
uses: dsherret/rust-toolchain-file@v1

- name: Install cargo-audit
run: |
cargo install cargo-audit
- uses: actions/checkout@v4

- name: Cache Rust toolchain and build artifacts
uses: Swatinem/rust-cache@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ keywords = ["geo", "fair", "sustainability"]
authors = ["slowtec GmbH <[email protected]>"]
license = "AGPL-3.0-or-later"
edition = "2021"
rust-version = "1.74.0"
rust-version = "1.73.0"

[workspace]
members = [
Expand Down
2 changes: 1 addition & 1 deletion ofdb-app-clearance/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0" # will stay 0.0.0 until published
authors = ["slowtec GmbH <[email protected]>"]
edition = "2021"
publish = false
rust-version = "1.74.0"
rust-version = "1.73.0"

[dependencies]
# Project dependencies
Expand Down
2 changes: 1 addition & 1 deletion ofdb-frontend/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0" # will stay 0.0.0 until published
authors = ["slowtec GmbH <[email protected]>"]
edition = "2021"
publish = false
rust-version = "1.74.0"
rust-version = "1.73.0"

[dependencies]
# Project dependencies
Expand Down
8 changes: 7 additions & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@
# Must be overridden in CI builds to specify different,
# custom targets!
[toolchain]
channel = "stable"

# Because 1.74 causes an internal compiler error
# (see https://github.com/rust-lang/rust/issues/117976)
# in combination with tantivy
# (see https://github.com/quickwit-oss/tantivy/issues/2260)
# we need to pin Rust to 1.73.
channel = "1.73"
profile = "minimal"
components = [ "rustfmt", "clippy" ]
targets = [ "wasm32-unknown-unknown" ]
15 changes: 3 additions & 12 deletions shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,9 @@ let
fenix_overlay = import "${fetchTarball "https://github.com/nix-community/fenix/archive/main.tar.gz"}/overlay.nix";
pkgs = import <nixpkgs> { overlays = [ fenix_overlay ]; };
fenix = pkgs.fenix;
rust_stable = fenix.stable;
rust_targets = with fenix.targets; [
wasm32-unknown-unknown.stable.rust-std
x86_64-unknown-linux-musl.stable.rust-std
];
rust = with rust_stable; (fenix.combine [
rustc
cargo
clippy
rustfmt
rust_targets
]);
rust = fenix.fromToolchainFile {
file = ./rust-toolchain.toml;
};
sass = with pkgs; stdenv.mkDerivation rec {
name = "dart-sass-${version}";
version = "1.63.6";
Expand Down

0 comments on commit f3470dc

Please sign in to comment.