Use !contains(matrix.os, 'macos') and its negation

kazarmy · Oct 22, 2024 · cec29da · cec29da
1 parent d38e7e0
commit cec29da
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -173,17 +173,17 @@ jobs:
 
     steps:
       - name: Show available memory on Linux
-        if: matrix.os != 'macos-13' && matrix.enabled
+        if: !contains(matrix.os, 'macos') && matrix.enabled
         run: free -h
       - uses: actions/checkout@v4
         if: matrix.enabled
         with:
           fetch-depth: 2
       - name: Install pkg-config with Homebrew
-        if: matrix.os == 'macos-13' && matrix.enabled
+        if: contains(matrix.os, 'macos') && matrix.enabled
         run: brew install pkg-config
       - name: Install python and other dependencies
-        if: (matrix.run_tests || matrix.build_system == 'meson') && matrix.os != 'macos-13' && matrix.enabled
+        if: (matrix.run_tests || matrix.build_system == 'meson') && !contains(matrix.os, 'macos') && matrix.enabled
         run: sudo apt-get --assume-yes install python3-wheel python3-setuptools libcapstone4 libcapstone-dev
       - name: Install meson and ninja
         if: matrix.build_system == 'meson' && matrix.enabled
@@ -198,7 +198,7 @@ jobs:
         if: matrix.run_tests && matrix.enabled
         run: pip3 install --user "file://$GITHUB_WORKSPACE/test/rz-pipe#egg=rzpipe&subdirectory=python" requests
       - name: Install Linux test dependencies
-        if: matrix.run_tests && matrix.enabled && matrix.os != 'macos-13'
+        if: matrix.run_tests && matrix.enabled && !contains(matrix.os, 'macos')
         run: |
           sudo apt-get update
           sudo apt-get --assume-yes install libc6 libc6-i386 libc6-dev debuginfod
@@ -237,7 +237,7 @@ jobs:
           export PKG_CONFIG_PATH=${HOME}/lib/pkgconfig:${HOME}/lib/$(uname -m)-linux-gnu/pkgconfig:${PKG_CONFIG_PATH}
           ninja -C build install
       - name: Disable user authentication for debugging (macOS)
-        if: matrix.os == 'macos-13' && matrix.enabled
+        if: contains(matrix.os, 'macos') && matrix.enabled
         run: |
           sudo security authorizationdb write system.privilege.taskport allow
       - name: Run unit tests (meson)