Skip to content

Commit b03c6f7

Browse files
committed
chore: re-enable building windows x86 toolchain (#2616)
<!-- Please make sure there is an issue that this PR is correlated to. --> ## Changes <!-- If there are frontend changes, please include screenshots. -->
1 parent e875d33 commit b03c6f7

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

.github/workflows/release.yaml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -92,18 +92,23 @@ jobs:
9292
- platform: linux
9393
runner: [self-hosted, Linux, X64]
9494
target: x86_64-unknown-linux-musl
95-
- platform: linux
96-
runner: [self-hosted, Linux, ARM64]
97-
target: aarch64-unknown-linux-musl
98-
# - platform: windows
99-
# runner: [self-hosted, Linux, X64]
100-
# target: x86_64-pc-windows-gnu
95+
binary_ext: ""
96+
arch: x86_64
97+
- platform: windows
98+
runner: [self-hosted, Linux, X64]
99+
target: x86_64-pc-windows-gnu
100+
binary_ext: ".exe"
101+
arch: x86_64
101102
- platform: macos
102103
runner: [self-hosted, Linux, X64]
103104
target: x86_64-apple-darwin
105+
binary_ext: ""
106+
arch: x86_64
104107
- platform: macos
105108
runner: [self-hosted, Linux, ARM64]
106109
target: aarch64-apple-darwin
110+
binary_ext: ""
111+
arch: aarch64
107112
runs-on: ${{ matrix.runner }}
108113
steps:
109114
- uses: actions/checkout@v4
@@ -119,7 +124,6 @@ jobs:
119124
export DOCKER_BUILDKIT=1
120125
121126
# Build the binary using our Dockerfile
122-
ARCH_ARG="${{ matrix.arch }}"
123127
docker/toolchain/build.sh ${{ matrix.target }}
124128
125129
# Make sure dist directory exists and binary is there
@@ -135,7 +139,7 @@ jobs:
135139
apt-get install -y unzip curl
136140
137141
# Install AWS CLI - use ARM version if running on ARM architecture
138-
if [ "${{ matrix.arch }}" = "arm64" ]; then
142+
if [ "${{ matrix.arch }}" = "aarch64" ]; then
139143
curl "https://awscli.amazonaws.com/awscli-exe-linux-aarch64.zip" -o "awscliv2.zip"
140144
else
141145
curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
@@ -144,12 +148,12 @@ jobs:
144148
./aws/install --update
145149
146150
COMMIT_SHA_SHORT="${GITHUB_SHA::7}"
147-
BINARY_PATH="dist/rivet-${{ matrix.target }}"
151+
BINARY_PATH="dist/rivet-${{ matrix.target }}${{ matrix.binary_ext }}"
148152
149153
# Must specify --checksum-algorithm for compatibility with R2
150154
aws s3 cp \
151155
"${BINARY_PATH}" \
152-
"s3://rivet/${COMMIT_SHA_SHORT}/rivet-${{ matrix.target }}" \
156+
"s3://rivet/${COMMIT_SHA_SHORT}/rivet-${{ matrix.target }}${{ matrix.binary_ext }}" \
153157
--region auto \
154158
--endpoint-url https://2a94c6a0ced8d35ea63cddc86c2681e7.r2.cloudflarestorage.com/rivet-releases \
155159
--checksum-algorithm CRC32

0 commit comments

Comments
 (0)