Merge pull request #31 from MarijnS95/mac-download-instead-of-brew

MacOS: Install `ispc` by downloading **versioned** release from GitHub
Twinklebear · Dec 16, 2023 · 861af9a · 861af9a
2 parents 84ba4f6 + afce1cf
commit 861af9a
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -12,8 +12,8 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v4
-            - run: curl -L https://github.com/ispc/ispc/releases/download/v${{ env.ISPC_VERSION }}/ispc-v${{ env.ISPC_VERSION }}-linux.tar.gz | tar xzv ispc-v${{ env.ISPC_VERSION }}-linux/bin/ispc
-            - run: realpath "ispc-v${{ env.ISPC_VERSION }}-linux/bin/" >> $GITHUB_PATH
+            - run: curl -L https://github.com/ispc/ispc/releases/download/v$ISPC_VERSION/ispc-v$ISPC_VERSION-linux.tar.gz | tar xzv ispc-v$ISPC_VERSION-linux/bin/ispc
+            - run: realpath "ispc-v$ISPC_VERSION-linux/bin/" >> $GITHUB_PATH
             - run: cargo build --all --all-targets --features ispc
             - run: cargo clippy --all --all-targets --features ispc -- -D warnings
             - run: cargo test --all
@@ -26,9 +26,10 @@ jobs:
         runs-on: macos-latest
         steps:
             - uses: actions/checkout@v4
-            - run: |
-                  curl -L https://github.com/ispc/ispc/releases/download/v${{ env.ISPC_VERSION }}/ispc-v${{ env.ISPC_VERSION }}-macOS.x86_64.tar.gz | tar xzv --strip-components=2 ispc-v${{ env.ISPC_VERSION }}-macOS.x86_64/bin/ispc
-                  echo "$PWD" >> $GITHUB_PATH
+            - name: Prepare Environment
+              run: |
+                curl -L https://github.com/ispc/ispc/releases/download/v$ISPC_VERSION/ispc-v$ISPC_VERSION-macOS.x86_64.tar.gz | tar xzv ispc-v$ISPC_VERSION-macOS.x86_64/bin/ispc
+                echo "$PWD/ispc-v$ISPC_VERSION-macOS.x86_64/bin/" >> $GITHUB_PATH
             - run: cargo build --all --all-targets --features ispc
             - run: cargo clippy --all --all-targets --features ispc -- -D warnings
             - run: cargo test --all
@@ -37,9 +38,9 @@ jobs:
         steps:
             - uses: actions/checkout@v4
             - run: |
-                  curl -LO https://github.com/ispc/ispc/releases/download/v${{ env.ISPC_VERSION }}/ispc-v${{ env.ISPC_VERSION }}-windows.zip
-                  unzip ispc-v${{ env.ISPC_VERSION }}-windows.zip ispc-v${{ env.ISPC_VERSION }}-windows/bin/ispc.exe
-                  Resolve-Path "ispc-v${{ env.ISPC_VERSION }}-windows/bin" | Add-Content -Path $env:GITHUB_PATH
+                  curl -LO https://github.com/ispc/ispc/releases/download/v$env:ISPC_VERSION/ispc-v$env:ISPC_VERSION-windows.zip
+                  unzip ispc-v$env:ISPC_VERSION-windows.zip ispc-v$env:ISPC_VERSION-windows/bin/ispc.exe
+                  Resolve-Path "ispc-v$env:ISPC_VERSION-windows/bin" | Add-Content -Path $env:GITHUB_PATH
             - run: cargo build --all --all-targets --features ispc
             - run: cargo clippy --all --all-targets --features ispc -- -D warnings
             - run: cargo test --all