From e178849b918950650d5c283ff08771f9660506c4 Mon Sep 17 00:00:00 2001 From: David Gidwani Date: Fri, 8 Mar 2024 12:42:46 -0500 Subject: [PATCH] ci: :ferris_wheel: fix macOS actions logic --- .github/workflows/wheels.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index f340ae2..5ead04f 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -28,7 +28,7 @@ jobs: uses: actions/checkout@v4 - name: Setup macOS environment - if: startsWith(matrix.os, 'flyci-macos') + if: contains(matrix.os, 'macos') run: | gid=$(id -g) uid=$(id -u) @@ -37,7 +37,7 @@ jobs: - name: Restore build dependencies cache (macOS) id: build-deps-macos - if: startsWith(matrix.os, 'flyci-macos') + if: contains(matrix.os, 'macos') uses: actions/cache/restore@v4 with: key: build-deps-${{ runner.os }}-${{ matrix.os }} @@ -46,12 +46,12 @@ jobs: /opt/pcre - name: Build Hyperscan (macOS) - if: startsWith(matrix.os, 'flyci-macos') && steps.build-deps-macos.outputs.cache-hit != 'true' + if: contains(matrix.os, 'macos') && steps.build-deps-macos.outputs.cache-hit != 'true' run: | ./build_tools/macos/build_hyperscan.sh - name: Upload build dependencies (macOS) - if: startsWith(matrix.os, 'flyci-macos') && steps.build-deps-macos.outputs.cache-hit != 'true' + if: contains(matrix.os, 'macos') && steps.build-deps-macos.outputs.cache-hit != 'true' uses: actions/cache/save@v4 with: key: ${{ steps.build-deps-macos.outputs.cache-primary-key }} @@ -62,7 +62,7 @@ jobs: - name: Capture build dependencies cache key id: build-deps-cache-key run: | - echo "value=${{ startsWith(matrix.os, 'flyci-macos') && steps.build-deps-macos.outputs.cache-primary-key || '' }}" >> $GITHUB_OUTPUT + echo "value=${{ contains(matrix.os, 'macos') && steps.build-deps-macos.outputs.cache-primary-key || '' }}" >> $GITHUB_OUTPUT build_wheels: name: ${{ matrix.python_id }}-${{ matrix.platform_id }} wheel @@ -242,7 +242,7 @@ jobs: echo "version=$(pdm run semantic-release version --no-commit 2>/dev/null)" >> "$GITHUB_OUTPUT" - name: Setup macOS environment - if: startsWith(matrix.os, 'flyci-macos') + if: contains(matrix.os, 'macos') run: | gid=$(id -g) uid=$(id -u) @@ -250,7 +250,7 @@ jobs: sudo chown -R $uid:$gid /opt/vectorscan /opt/pcre - name: Restore build dependencies cache - if: startsWith(matrix.os, 'flyci-macos') + if: contains(matrix.os, 'macos') uses: actions/cache/restore@v4 with: key: ${{ needs.build_environment.outputs.build-deps-cache-key }}