GH Actions: Use korandoru/setup-zig for zig workflows

PR #636 (bdwgc).
ivmai · Apr 24, 2024 · b4e4fee · b4e4fee
1 parent 0ca8be5
commit b4e4fee
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/.github/workflows/zig-build.yml b/.github/workflows/zig-build.yml
@@ -78,17 +78,12 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: "Install zig on Linux/x86_64"
-      if: runner.os == 'Linux'
-      run: |
-        mkdir zig && curl https://ziglang.org/builds/zig-linux-x86_64-${{matrix.zig_version}}.tar.xz | tar Jx --directory=zig --strip-components=1
-    - name: "Install zig on MacOS/x86_64"
-      if: runner.os == 'macOS'
-      run: |
-        mkdir zig && curl https://ziglang.org/builds/zig-macos-x86_64-${{matrix.zig_version}}.tar.xz | tar Jx --directory=zig --strip-components=1
+    - uses: korandoru/setup-zig@v1
+      with:
+        zig-version: ${{ matrix.zig_version }}
     - name: Build
       run: >
-        zig/zig build
+        zig build
         -DBUILD_SHARED_LIBS=${{ matrix.shared_libs }}
         -Ddisable_handle_fork=${{ matrix.disable_handle_fork }}
         -Denable_gc_assertions=${{ matrix.gc_assertions }}

diff --git a/.github/workflows/zig-cross-compile.yml b/.github/workflows/zig-cross-compile.yml
@@ -121,12 +121,12 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: "Install zig"
-      run: |
-        mkdir zig && curl https://ziglang.org/builds/zig-linux-x86_64-${{matrix.zig_version}}.tar.xz | tar Jx --directory=zig --strip-components=1
+    - uses: korandoru/setup-zig@v1
+      with:
+        zig-version: ${{ matrix.zig_version }}
     - name: Build
       run: >
-        zig/zig build -Dtarget=${{ matrix.ttriple }}
+        zig build -Dtarget=${{ matrix.ttriple }}
         -DBUILD_SHARED_LIBS=${{ matrix.shared_libs }}
         -DCFLAGS_EXTRA="${{ matrix.cflags_extra }}"
         -Denable_threads=${{ matrix.enable_threads }}