GH Actions: Specify zig version in a dedicated field

Issue #602 (bdwgc).
ivmai · Jan 11, 2024 · f9251a4 · f9251a4
1 parent 749ee98
commit f9251a4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/zig-build.yml b/.github/workflows/zig-build.yml
@@ -1,7 +1,7 @@
 # This workflow is for zig-based build/test running on Linux/x86_64.
 name: zig build
 
-on: [push, pull_request]
+on: [ push, pull_request ]
 
 jobs:
   build:
@@ -13,6 +13,8 @@ jobs:
       fail-fast: false
 
       matrix:
+        # TODO: move from nightly to zig 0.12 final when released.
+        zig_version: [ "0.12.0-dev.2076+8fd15c6ca" ]
         gc_assertions: [ true ]
         large_config: [ false ]
         enable_threads: [ false, true ]
@@ -36,12 +38,11 @@ jobs:
         - enable_gc_debug: true # FIXME: some tests fail if gc_debug+redirect
           redirect_malloc: true
 
-    # TODO: move from nightly to zig 0.12 final when released.
     steps:
     - uses: actions/checkout@v4
     - name: "Install zig"
       run: |
-        mkdir zig && curl https://ziglang.org/builds/zig-linux-x86_64-0.12.0-dev.2076+8fd15c6ca.tar.xz | tar Jx --directory=zig --strip-components=1
+        mkdir zig && curl https://ziglang.org/builds/zig-linux-x86_64-${{matrix.zig_version}}.tar.xz | tar Jx --directory=zig --strip-components=1
     - name: Build
       run: >
         zig/zig build

diff --git a/.github/workflows/zig-cross-compile.yml b/.github/workflows/zig-cross-compile.yml
@@ -13,6 +13,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        # TODO: move from nightly to zig 0.12 final when released.
+        zig_version: [ "0.12.0-dev.2076+8fd15c6ca" ]
         # Some of the triples are commented out just to speedup this workflow.
         ttriple: [
           aarch64-linux-gnu,
@@ -97,12 +99,11 @@ jobs:
         - shared_libs: true
           ttriple: x86_64-linux-gnux32 # FIXME: recompile with -fPIC
 
-    # TODO: move from nightly to zig 0.12 final when released.
     steps:
     - uses: actions/checkout@v4
     - name: "Install zig"
       run: |
-        mkdir zig && curl https://ziglang.org/builds/zig-linux-x86_64-0.12.0-dev.2076+8fd15c6ca.tar.xz | tar Jx --directory=zig --strip-components=1
+        mkdir zig && curl https://ziglang.org/builds/zig-linux-x86_64-${{matrix.zig_version}}.tar.xz | tar Jx --directory=zig --strip-components=1
     - name: Build
       run: >
         zig/zig build -Dtarget=${{ matrix.ttriple }}