Skip to content

Commit 29005d4

Browse files
committed
fix windows
1 parent 472401c commit 29005d4

2 files changed

Lines changed: 19 additions & 10 deletions

File tree

.github/workflows/verify-release-candidate.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,18 @@ jobs:
4242
fail-fast: false
4343
matrix:
4444
include:
45-
# # Linux
46-
# - os: linux
47-
# arch: x64
48-
# runner: ubuntu-latest
45+
# Linux
46+
- os: linux
47+
arch: x64
48+
runner: ubuntu-latest
4949
# - os: linux
5050
# arch: arm64
5151
# runner: ubuntu-24.04-arm
5252

53-
# # macOS
54-
# - os: macos
55-
# arch: arm64
56-
# runner: macos-latest
53+
# macOS
54+
- os: macos
55+
arch: arm64
56+
runner: macos-latest
5757
# - os: macos
5858
# arch: x64
5959
# runner: macos-15-intel

dev/release/verify-release-candidate.sh

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,17 @@ test_source_distribution() {
112112

113113
curl https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path
114114

115-
export PATH=$RUSTUP_HOME/bin:$PATH
116-
source $RUSTUP_HOME/env
115+
# On Unix, rustup creates an env file. On Windows GitHub runners (MSYS bash),
116+
# that file may not exist, so fall back to adding Cargo bin directly.
117+
if [ -f "$CARGO_HOME/env" ]; then
118+
# shellcheck disable=SC1090
119+
source "$CARGO_HOME/env"
120+
elif [ -f "$RUSTUP_HOME/env" ]; then
121+
# shellcheck disable=SC1090
122+
source "$RUSTUP_HOME/env"
123+
else
124+
export PATH="$CARGO_HOME/bin:$PATH"
125+
fi
117126

118127
# build and test rust
119128

0 commit comments

Comments
 (0)