From 4efa97b8bc195b1ea664baac7fb0eefbfb321506 Mon Sep 17 00:00:00 2001 From: David Gonzalez Martin Date: Wed, 24 Apr 2024 14:04:56 -0600 Subject: [PATCH] Better handle Zig dependency on CI --- .github/workflows/ci.yml | 8 -------- ci/linux_gnu_runner.sh | 11 +++++++++-- ci/macos_runner.sh | 12 +++++++++++- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 471f1f0..cf46ec1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,10 +15,6 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - name: Set up Zig - uses: goto-bus-stop/setup-zig@v2 - with: - version: master - name: Build and test run: sh ci/linux_gnu_runner.sh macos: @@ -27,9 +23,5 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - name: Set up Zig - uses: davidgm94/setup-zig@foo - with: - version: master - name: Build and test run: sh ci/macos_runner.sh diff --git a/ci/linux_gnu_runner.sh b/ci/linux_gnu_runner.sh index 3cc9f05..0c09542 100644 --- a/ci/linux_gnu_runner.sh +++ b/ci/linux_gnu_runner.sh @@ -1,10 +1,17 @@ #!/bin/sh set -ex +# Install LLVM and system dependencies wget https://apt.llvm.org/llvm.sh chmod +x llvm.sh sudo ./llvm.sh 17 all - sudo apt install liblld-17-dev libclang-17-dev liblld-17 ninja-build cmake -y -zig build test -Dthird_party_ci=true +# Install Zig +ZIG_VERSION=0.12.0 +ZIG_PACKAGE_NAME=zig-linux-x86_64-$ZIG_VERSION +wget https://ziglang.org/download/$ZIG_VERSION/$ZIG_PACKAGE_NAME.tar.xz +tar xf $ZIG_PACKAGE_NAME.tar.xz + +# Build and test +$ZIG_PACKAGE_NAME/zig build test -Dthird_party_ci=true diff --git a/ci/macos_runner.sh b/ci/macos_runner.sh index b6a6362..f988c01 100644 --- a/ci/macos_runner.sh +++ b/ci/macos_runner.sh @@ -1,5 +1,15 @@ #!/bin/sh set -ex + +# Install LLVM and system dependencies brew update brew install llvm@17 ninja -zig build test -Dthird_party_ci + +# Install Zig +ZIG_VERSION=0.12.0 +ZIG_PACKAGE_NAME=zig-macos-aarch64-$ZIG_VERSION +wget https://ziglang.org/download/$ZIG_VERSION/$ZIG_PACKAGE_NAME.tar.xz +tar xf $ZIG_PACKAGE_NAME.tar.xz + +# Build and test +$ZIG_PACKAGE_NAME/zig build test -Dthird_party_ci=true