Skip to content

Commit 74f73a9

Browse files
committed
Bump Rust pin to 1.96.0; build yashrs 3.1.0/3.2.0; floor 0.x at 0.3.0
yash-cli 3.1.0 and 3.2.0 declare rust-version 1.96.0, which the pinned RUST_TOOLCHAIN=1.95.0 refused. Bump the shared Rust pin to 1.96.0 (current latest stable; satisfies both crates' MSRV) and rebuild the toolchain image. A compiler bump changes every Rust binary, so regenerate all brush + yashrs build checksums. Probed on shvr-toolchain:probe-amd64 with CI paths: all brush (0.2.23/0.3.0/ 0.4.0) and yashrs 0.3.0..3.2.0 build and run under 1.96.0; a second independent build of brush_0.4.0, yashrs_3.2.0 and yashrs_3.0.8 reproduces the committed checksums bit-for-bit, and the new source checksums match a verified (non-skip) fetch. Drop the 3.1.0 rust-floor exclusion; 3.0.6 stays excluded (E0599 code bug, Step 4). Promote 3.2.0 and 3.1.0 (newest of each modern series) into the latest flavor. Prune the pre-rewrite experimental yashrs 0.1.0/0.2.0: floor the 0.x line at 0.3.0 in .excluded, drop them from .all and their source/build checksums, and regenerate the matrix.
1 parent 7510377 commit 74f73a9

32 files changed

Lines changed: 53 additions & 58 deletions

File tree

.github/actions/downloads/action.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -877,6 +877,16 @@ runs:
877877
shvr_shell: yash
878878
shvr_version: "2.45"
879879
cache_path: "yash/2.45"
880+
- uses: ./.github/actions/single-download
881+
with:
882+
shvr_shell: yashrs
883+
shvr_version: "3.2.0"
884+
cache_path: "yashrs/3.2.0"
885+
- uses: ./.github/actions/single-download
886+
with:
887+
shvr_shell: yashrs
888+
shvr_version: "3.1.0"
889+
cache_path: "yashrs/3.1.0"
880890
- uses: ./.github/actions/single-download
881891
with:
882892
shvr_shell: yashrs
@@ -952,16 +962,6 @@ runs:
952962
shvr_shell: yashrs
953963
shvr_version: "0.3.0"
954964
cache_path: "yashrs/0.3.0"
955-
- uses: ./.github/actions/single-download
956-
with:
957-
shvr_shell: yashrs
958-
shvr_version: "0.2.0"
959-
cache_path: "yashrs/0.2.0"
960-
- uses: ./.github/actions/single-download
961-
with:
962-
shvr_shell: yashrs
963-
shvr_version: "0.1.0"
964-
cache_path: "yashrs/0.1.0"
965965
- uses: ./.github/actions/single-download
966966
with:
967967
shvr_shell: zsh

.github/workflows/docker.yml

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -893,6 +893,14 @@ jobs:
893893
shell: yash
894894
version: "2.45"
895895
cache_path: "yash/2.45"
896+
- target: yashrs_3.2.0
897+
shell: yashrs
898+
version: "3.2.0"
899+
cache_path: "yashrs/3.2.0"
900+
- target: yashrs_3.1.0
901+
shell: yashrs
902+
version: "3.1.0"
903+
cache_path: "yashrs/3.1.0"
896904
- target: yashrs_3.0.8
897905
shell: yashrs
898906
version: "3.0.8"
@@ -953,14 +961,6 @@ jobs:
953961
shell: yashrs
954962
version: "0.3.0"
955963
cache_path: "yashrs/0.3.0"
956-
- target: yashrs_0.2.0
957-
shell: yashrs
958-
version: "0.2.0"
959-
cache_path: "yashrs/0.2.0"
960-
- target: yashrs_0.1.0
961-
shell: yashrs
962-
version: "0.1.0"
963-
cache_path: "yashrs/0.1.0"
964964
- target: zsh_5.9.1
965965
shell: zsh
966966
version: "5.9.1"
@@ -1051,9 +1051,8 @@ jobs:
10511051
posh_0.13.2
10521052
yash_2.61
10531053
yash_2.60
1054-
yashrs_3.0.5
1055-
yashrs_3.0.4
1056-
yashrs_0.4.5
1054+
yashrs_3.2.0
1055+
yashrs_3.1.0
10571056
zsh_5.9.1
10581057
zsh_5.8.1
10591058
- flavor: all
@@ -1232,6 +1231,8 @@ jobs:
12321231
yash_2.47
12331232
yash_2.46
12341233
yash_2.45
1234+
yashrs_3.2.0
1235+
yashrs_3.1.0
12351236
yashrs_3.0.8
12361237
yashrs_3.0.7
12371238
yashrs_3.0.5
@@ -1247,8 +1248,6 @@ jobs:
12471248
yashrs_0.4.1
12481249
yashrs_0.4.0
12491250
yashrs_0.3.0
1250-
yashrs_0.2.0
1251-
yashrs_0.1.0
12521251
zsh_5.9.1
12531252
zsh_5.8.1
12541253
zsh_5.7.1

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ FROM ${TOOLCHAIN_BASE} AS toolchain
5252
# hosts and runs; otherwise rustup-init downloads "latest stable" at
5353
# image-build time, which drifts and breaks cross-host reproducibility.
5454
# Bump when refreshing the base and regenerate the affected checksums.
55-
ARG RUST_TOOLCHAIN=1.95.0
55+
ARG RUST_TOOLCHAIN=1.96.0
5656
COPY "build/rustup-init-*" "/usr/src/shvr/"
5757
COPY "checksums/sources/rustup-init-*" "/shvr/checksums/sources/"
5858
RUN sh "${SHVR_DIR_SRC}/rustup-init-1.28.2.sh" -y --default-toolchain "${RUST_TOOLCHAIN}" && \
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9c955bd690723f22b51e1a9edfb066476daad7abb0d6633ba197bc46f6a98447 brush
1+
48f3de2168f282982338a427cadda4c681068c0aea8eaf29b671bbb76e55a9c8 brush
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
e0a8c4cec0911e9226267570c6401811e09c7c56f45e28c396fe7db5d30cdc3c brush
1+
baa37c46b301b22213c588665eebf8eb1b4af97e6d2fa428a582055080b646c8 brush
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ca8c948892cde059498ce5e04bae0467b5f89ab767ae40888c1599075f266ebb brush
1+
b93cf28ed70c4a669fab037b1952a53040f27bee2f5f1845935e4faf26aad658 brush

checksums/build/yashrs_0.1.0/bin/yash3.sha256sums

Lines changed: 0 additions & 1 deletion
This file was deleted.

checksums/build/yashrs_0.2.0/bin/yash3.sha256sums

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3f6d067ad8bbce7f8844578dcf5a754332c67984fc4da0470270726b12d01b72 yash3
1+
7d8419a18b7e595e75fd7a2c57fc9e686c86dde63ab0c2f9fe160d0016f6cd47 yash3
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8c612b4930cb2e38a8bf595c5e81db914feee5d141b20b10fb0f1d5013c240a2 yash3
1+
60bc9cac4e31c0466930a413699e642615e84bbc7fb76cbe5acbf713524085fc yash3

0 commit comments

Comments
 (0)