Skip to content

Commit 6cb2b3f

Browse files
committed
Fix CI
1 parent 9a954bd commit 6cb2b3f

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

.github/workflows/test-pack-lib.yml

+14-13
Original file line numberDiff line numberDiff line change
@@ -41,24 +41,25 @@ jobs:
4141
fail-fast: false
4242
steps:
4343
- name: "Process env string"
44+
id: process-env
4445
shell: bash
4546
run: |
4647
case "${{ matrix.runner }}" in
4748
ubuntu-latest)
48-
echo "OS=linux" >> $env:GITHUB_ENV
49-
echo "ARCH=x86_64" >> $env:GITHUB_ENV
49+
echo "OS=linux" >> "$GITHUB_OUTPUT"
50+
echo "ARCH=x86_64" >> "$GITHUB_OUTPUT"
5051
;;
5152
windows-latest)
52-
echo "OS=windows" >> $env:GITHUB_ENV
53-
echo "ARCH=x86_64" >> $env:GITHUB_ENV
53+
echo "OS=windows" >> "$GITHUB_OUTPUT"
54+
echo "ARCH=x86_64" >> "$GITHUB_OUTPUT"
5455
;;
5556
macos-13)
56-
echo "OS=darwin" >> $env:GITHUB_ENV
57-
echo "ARCH=x86_64" >> $env:GITHUB_ENV
57+
echo "OS=darwin" >> "$GITHUB_OUTPUT"
58+
echo "ARCH=x86_64" >> "$GITHUB_OUTPUT"
5859
;;
5960
macos-14)
60-
echo "OS=darwin" >> $env:GITHUB_ENV
61-
echo "ARCH=aarch64" >> $env:GITHUB_ENV
61+
echo "OS=darwin" >> "$GITHUB_OUTPUT"
62+
echo "ARCH=aarch64" >> "$GITHUB_OUTPUT"
6263
;;
6364
esac
6465
@@ -96,17 +97,17 @@ jobs:
9697

9798
- run: bin/spc download --for-libs="${{ matrix.lib }}" --debug --retry=5 --shallow-clone
9899

99-
- name: "Download pre-built pkg-config for ${{ env.OS }}-${{ env.ARCH }}"
100-
if: (env.OS == 'linux' || env.OS == 'darwin') && matrix.lib != 'pkg-config'
100+
- name: "Download pre-built pkg-config for ${{ matrix.runner }}"
101+
if: matrix.runner != 'windows-latest' && matrix.lib != 'pkg-config'
101102
run: |
102103
bin/spc download --for-libs="pkg-config" --debug --retry=5 --shallow-clone --prefer-pre-built
103104
bin/spc build:libs pkg-config --debug
104105
105-
- if: env.OS != 'windows' || matrix.lib != 'pkg-config'
106+
- if: matrix.runner != 'windows-latest' || matrix.lib != 'pkg-config'
106107
run: bin/spc dev:pack-lib --debug ${{ matrix.lib }}
107108

108-
- name: "Upload packed lib (${{ matrix.lib }} for ${{ env.OS }}-${{ env.ARCH }})"
109+
- name: "Upload packed lib (${{ matrix.lib }} for ${{ steps.process-env.outputs.ARCH }}-${{ steps.process-env.outputs.OS }})"
109110
uses: actions/upload-artifact@v2
110111
with:
111112
path: dist/${{ matrix.lib }}-${{ env.ARCH }}-${{ env.OS }}.txz
112-
name: ${{ matrix.lib }}-${{ env.ARCH }}-${{ env.OS }}
113+
name: ${{ matrix.lib }}-${{ steps.process-env.outputs.ARCH }}-${{ steps.process-env.outputs.OS }}

0 commit comments

Comments
 (0)