From d769b51af22b4d53e3db74ce39af85fb7fde4db4 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Sun, 7 Jul 2024 22:29:52 +0800 Subject: [PATCH] Fix CI --- .github/workflows/test-pack-lib.yml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test-pack-lib.yml b/.github/workflows/test-pack-lib.yml index 90b03a47..1a589ce3 100644 --- a/.github/workflows/test-pack-lib.yml +++ b/.github/workflows/test-pack-lib.yml @@ -41,24 +41,25 @@ jobs: fail-fast: false steps: - name: "Process env string" + id: process-env shell: bash run: | case "${{ matrix.runner }}" in ubuntu-latest) - echo "OS=linux" >> $env:GITHUB_ENV - echo "ARCH=x86_64" >> $env:GITHUB_ENV + echo "OS=linux" >> "$GITHUB_OUTPUT" + echo "ARCH=x86_64" >> "$GITHUB_OUTPUT" ;; windows-latest) - echo "OS=windows" >> $env:GITHUB_ENV - echo "ARCH=x86_64" >> $env:GITHUB_ENV + echo "OS=windows" >> "$GITHUB_OUTPUT" + echo "ARCH=x86_64" >> "$GITHUB_OUTPUT" ;; macos-13) - echo "OS=darwin" >> $env:GITHUB_ENV - echo "ARCH=x86_64" >> $env:GITHUB_ENV + echo "OS=darwin" >> "$GITHUB_OUTPUT" + echo "ARCH=x86_64" >> "$GITHUB_OUTPUT" ;; macos-14) - echo "OS=darwin" >> $env:GITHUB_ENV - echo "ARCH=aarch64" >> $env:GITHUB_ENV + echo "OS=darwin" >> "$GITHUB_OUTPUT" + echo "ARCH=aarch64" >> "$GITHUB_OUTPUT" ;; esac @@ -96,17 +97,17 @@ jobs: - run: bin/spc download --for-libs="${{ matrix.lib }}" --debug --retry=5 --shallow-clone - - name: "Download pre-built pkg-config for ${{ env.OS }}-${{ env.ARCH }}" - if: (env.OS == 'linux' || env.OS == 'darwin') && matrix.lib != 'pkg-config' + - name: "Download pre-built pkg-config for ${{ matrix.runner }}" + if: matrix.runner != 'windows-latest' && matrix.lib != 'pkg-config' run: | bin/spc download --for-libs="pkg-config" --debug --retry=5 --shallow-clone --prefer-pre-built bin/spc build:libs pkg-config --debug - - if: env.OS != 'windows' || matrix.lib != 'pkg-config' + - if: matrix.runner != 'windows-latest' || matrix.lib != 'pkg-config' run: bin/spc dev:pack-lib --debug ${{ matrix.lib }} - - name: "Upload packed lib (${{ matrix.lib }} for ${{ env.OS }}-${{ env.ARCH }})" + - name: "Upload packed lib (${{ matrix.lib }} for ${{ steps.process-env.outputs.ARCH }}-${{ steps.process-env.outputs.OS }})" uses: actions/upload-artifact@v2 with: path: dist/${{ matrix.lib }}-${{ env.ARCH }}-${{ env.OS }}.txz - name: ${{ matrix.lib }}-${{ env.ARCH }}-${{ env.OS }} \ No newline at end of file + name: ${{ matrix.lib }}-${{ steps.process-env.outputs.ARCH }}-${{ steps.process-env.outputs.OS }} \ No newline at end of file