Skip to content

Commit a9aa1c2

Browse files
authored
ci: Fixes parsing of MSRV (#2555)
* Fixes parsing of MSRV * Pins half and errorchecks MSRV
1 parent d0c2366 commit a9aa1c2

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,15 @@ jobs:
5454
- name: Evaluate definitions
5555
id: definitions
5656
run: |
57-
export MSRV=$(rustup show | awk 'NF' | awk 'END{print $2}')
57+
rustup show active-toolchain
58+
export MSRV=$(rustup show active-toolchain | awk -F'-' '{print $1}')
59+
if [ -z "$MSRV" ]; then
60+
echo "Error: MSRV did not parse correctly"
61+
exit 1
62+
fi
5863
echo "msrv=$MSRV"
5964
echo "msrv=$MSRV" >> $GITHUB_OUTPUT
60-
export RAW_VERSIONS="stable beta $RUST_NIGHTLY_TOOLCHAIN $MSRV"
65+
export RAW_VERSIONS="stable beta $MSRV"
6166
export VERSIONS=$(echo $RAW_VERSIONS | jq -scR 'rtrimstr("\n")|split(" ")|.')
6267
echo "versions=$VERSIONS"
6368
echo "versions=$VERSIONS" >> $GITHUB_OUTPUT

quic/s2n-quic-bench/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ publish = false
1212
bytes = "1"
1313
criterion = { version = "0.5", features = ["html_reports"] }
1414
crossbeam-channel = { version = "0.5" }
15+
half = "=2.4.1" # Can be unpinned when we move to MSRV 1.81
1516
internet-checksum = "0.2"
1617
s2n-codec = { path = "../../common/s2n-codec", features = ["testing"] }
1718
s2n-quic-core = { path = "../s2n-quic-core", features = ["testing"] }

0 commit comments

Comments
 (0)