Skip to content
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

Remove rust nightly #39

Merged
merged 1 commit into from
Nov 10, 2024
+16 −46
Merged

Remove rust nightly #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 0 additions & 9 deletions builds.template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@
env:
rust_pins:
stable: &rust_stable "${RUST_STABLE_PIN}"
nightly: &nightly_pin "${RUST_NIGHTLY_PIN}"
llvm_for_rust_pins:
stable: &llvm_stable "${RUST_STABLE_PIN_LLVM}"
nightly: &llvm_nightly "${RUST_NIGHTLY_PIN_LLVM}"
nixpkgs:
unstable: &nixpkgs_unstable "${NIXPKGS_COMMIT}"
just:
Expand All @@ -31,12 +29,5 @@ matrix:
- "x86_64-unknown-linux-gnu"
- "x86_64-unknown-linux-musl"
just: *just_version
- # pinned nightly
<<: *default
key: "nightly"
llvm: *llvm_nightly
rust:
channel: "nightly"
version: *nightly_pin
nixpkgs:
- *nixpkgs_unstable
9 changes: 0 additions & 9 deletions builds.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@
env:
rust_pins:
stable: &rust_stable "1.82.0"
nightly: &nightly_pin "2024-11-07"
llvm_for_rust_pins:
stable: &llvm_stable "19"
nightly: &llvm_nightly "19"
nixpkgs:
unstable: &nixpkgs_unstable "85f7e662eda4fa3a995556527c87b2524b691933"
just:
Expand All @@ -31,12 +29,5 @@ matrix:
- "x86_64-unknown-linux-gnu"
- "x86_64-unknown-linux-musl"
just: *just_version
- # pinned nightly
<<: *default
key: "nightly"
llvm: *llvm_nightly
rust:
channel: "nightly"
version: *nightly_pin
nixpkgs:
- *nixpkgs_unstable
9 changes: 1 addition & 8 deletions default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,14 +212,7 @@

rust-toolchain = with rust-version;
(toolchainPkgs.rust-bin.${channel}.${version}.${profile}.override {
extensions = [
"cargo"
"clippy"
"rust-src"
"rust-std"
"rustfmt"
];
targets = targets;
inherit targets extensions;
});

# Don't add in a shell here or it may override the shell in the
Expand Down
14 changes: 7 additions & 7 deletions nix/versions.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@
llvm = "19";
profile = "default";
targets = ["x86_64-unknown-linux-gnu" "x86_64-unknown-linux-musl"];
};
nightly = {
channel = "nightly";
version = "2024-11-07";
llvm = "19";
profile = "default";
targets = ["x86_64-unknown-linux-gnu" "x86_64-unknown-linux-musl"];
extensions = [
"cargo"
"clippy"
"rust-src"
"rust-std"
"rustfmt"
];
};
};
}
14 changes: 7 additions & 7 deletions nix/versions.nix.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@
llvm = "$RUST_STABLE_PIN_LLVM";
profile = "default";
targets = ["x86_64-unknown-linux-gnu" "x86_64-unknown-linux-musl"];
};
nightly = {
channel = "nightly";
version = "$RUST_NIGHTLY_PIN";
llvm = "$RUST_NIGHTLY_PIN_LLVM";
profile = "default";
targets = ["x86_64-unknown-linux-gnu" "x86_64-unknown-linux-musl"];
extensions = [
"cargo"
"clippy"
"rust-src"
"rust-std"
"rustfmt"
];
};
};
}
7 changes: 1 addition & 6 deletions scripts/bump.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,18 +99,13 @@ pushd "${project_dir}"

rustup update
rustup toolchain install "stable"
rustup toolchain install "nightly"
rustup update

declare RUST_STABLE_PIN RUST_NIGHTLY_PIN RUST_STABLE_PIN_LLVM RUST_NIGHTLY_PIN_LLVM
declare RUST_STABLE_PIN RUST_STABLE_PIN_LLVM
RUST_STABLE_PIN="$(rustc "+stable" -vV | grep 'release:' | awk '{print $NF}')"
RUST_NIGHTLY_PIN="$(rustc "+nightly" -vV | grep 'commit-date:' | awk '{print $NF}')"
RUST_STABLE_PIN_LLVM="$(rustc "+stable" -vV | grep 'LLVM version:' | awk '{print $NF}' | sed 's/\([0-9]\+\)\.[0-9]\+\.[0-9]\+/\1/')"
RUST_NIGHTLY_PIN_LLVM="$(rustc "+nightly" -vV | grep 'LLVM version:' | awk '{print $NF}' | sed 's/\([0-9]\+\)\.[0-9]\+\.[0-9]\+/\1/')"
declare -rx RUST_STABLE_PIN
declare -rx RUST_NIGHTLY_PIN
declare -rx RUST_STABLE_PIN_LLVM
declare -rx RUST_NIGHTLY_PIN_LLVM

declare JUST_STABLE_PIN
JUST_STABLE_PIN="$(just --version | grep '^just ' | awk '{print $NF}')"
Expand Down
Loading