Skip to content

Commit 31f3bd8

Browse files
committed
Use matrix setting for shell type instead of conditional
1 parent 8bc85d5 commit 31f3bd8

1 file changed

Lines changed: 21 additions & 5 deletions

File tree

.github/workflows/release.yml

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,39 @@ jobs:
1717
- host: macos-15-intel
1818
target: x86_64-apple-darwin
1919
npm_platform: darwin-x64
20+
shell: bash
2021
- host: macos-latest
2122
target: aarch64-apple-darwin
2223
npm_platform: darwin-arm64
24+
shell: bash
2325
- host: windows-latest
2426
target: x86_64-pc-windows-msvc
2527
npm_platform: win32-x64-msvc
28+
shell: bash
2629
- host: windows-11-arm
2730
target: aarch64-pc-windows-msvc
2831
npm_platform: win32-arm64-msvc
32+
shell: bash
2933
- host: ubuntu-latest
3034
target: x86_64-unknown-linux-gnu
3135
npm_platform: linux-x64-gnu
36+
shell: bash
3237
- host: ubuntu-24.04-arm
3338
target: aarch64-unknown-linux-gnu
3439
npm_platform: linux-arm64-gnu
40+
shell: bash
3541
- host: ubuntu-latest
3642
target: x86_64-unknown-linux-musl
3743
npm_platform: linux-x64-musl
3844
alpine: true
3945
alpine_arch: x86_64
46+
shell: alpine.sh {0}
4047
- host: ubuntu-latest
4148
target: aarch64-unknown-linux-musl
4249
npm_platform: linux-arm64-musl
4350
alpine: true
4451
alpine_arch: aarch64
52+
shell: alpine.sh {0}
4553
steps:
4654
# Speed up apt-get operations by disabling unnecessary man-db auto-update
4755
- name: Disable man-db auto-update
@@ -79,13 +87,13 @@ jobs:
7987
sudo apt-get install -y libcups2-dev pkg-config clang
8088
- name: Prepare Rust toolchain (musl)
8189
if: matrix.settings.alpine
82-
shell: alpine.sh {0}
90+
shell: ${{ matrix.settings.shell }}
8391
run: rustup target add ${{ matrix.settings.target }}
8492
- name: Install dependencies
85-
shell: ${{ matrix.settings.alpine && 'alpine.sh {0}' || 'bash' }}
93+
shell: ${{ matrix.settings.shell }}
8694
run: npm ci
8795
- name: Build N-API module
88-
shell: ${{ matrix.settings.alpine && 'alpine.sh {0}' || 'bash' }}
96+
shell: ${{ matrix.settings.shell }}
8997
run: |
9098
echo "Building for target: ${{ matrix.settings.target }}"
9199
task build:napi
@@ -129,25 +137,33 @@ jobs:
129137
settings:
130138
- host: macos-13
131139
target: x86_64-apple-darwin
140+
shell: bash
132141
- host: macos-14
133142
target: aarch64-apple-darwin
143+
shell: bash
134144
- host: windows-latest
135145
target: x86_64-pc-windows-msvc
146+
shell: bash
136147
- host: windows-11-arm
137148
target: aarch64-pc-windows-msvc
138149
test_runtimes: rust node
150+
shell: bash
139151
- host: ubuntu-latest
140152
target: x86_64-unknown-linux-gnu
153+
shell: bash
141154
- host: ubuntu-24.04-arm
142155
target: aarch64-unknown-linux-gnu
156+
shell: bash
143157
- host: ubuntu-latest
144158
target: x86_64-unknown-linux-musl
145159
alpine: true
146160
alpine_arch: x86_64
161+
shell: alpine.sh {0}
147162
- host: ubuntu-latest
148163
target: aarch64-unknown-linux-musl
149164
alpine: true
150165
alpine_arch: aarch64
166+
shell: alpine.sh {0}
151167
steps:
152168
# Speed up apt-get operations by disabling unnecessary man-db auto-update
153169
- name: Disable man-db auto-update and install deps (glibc)
@@ -208,10 +224,10 @@ jobs:
208224
done
209225
ls -la npm/ 2>/dev/null || dir npm
210226
- name: Install Node.js dependencies
211-
shell: ${{ matrix.settings.alpine && 'alpine.sh {0}' || 'bash' }}
227+
shell: ${{ matrix.settings.shell }}
212228
run: npm ci
213229
- name: Run comprehensive tests (includes compilation)
214-
shell: ${{ matrix.settings.alpine && 'alpine.sh {0}' || 'bash' }}
230+
shell: ${{ matrix.settings.shell }}
215231
run: |
216232
if [ -n "${{ matrix.settings.test_runtimes }}" ]; then
217233
echo "Running selective runtime tests: ${{ matrix.settings.test_runtimes }}"

0 commit comments

Comments
 (0)