From 2760393166f2d3c2502f6ceb4dd3020daa154c86 Mon Sep 17 00:00:00 2001 From: mlugg Date: Fri, 19 Jul 2024 18:49:39 +0100 Subject: [PATCH] ci: update to Zig 0.13.0 --- .github/workflows/actions-build.sh | 5 ---- .github/workflows/build.yml | 35 ++++++++++------------------ .github/workflows/install-shaderc.sh | 6 ----- 3 files changed, 12 insertions(+), 34 deletions(-) delete mode 100755 .github/workflows/actions-build.sh delete mode 100755 .github/workflows/install-shaderc.sh diff --git a/.github/workflows/actions-build.sh b/.github/workflows/actions-build.sh deleted file mode 100755 index 026eb46..0000000 --- a/.github/workflows/actions-build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -zig build \ - -Doptimize=ReleaseSafe -Dglslc="$PWD/shaderc/bin/glslc" \ - -Dsuffix -Dstrip -Dtimestamp -Dtarget="$1" - diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cb0e42d..e43a1d8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,39 +1,28 @@ name: Build native binaries -on: - push: - branches: [main] - paths: - - 'src/**' - - '**.zig' - - '.github/**' +on: [push, pull_request] jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - - uses: actions/cache@v2 - with: - key: ${{ runner.os }}-build - path: | - zig-cache - ~/.cache/deps-zig - - - uses: actions/checkout@v2 - - uses: goto-bus-stop/setup-zig@v1 - with: {version: "0.11.0"} + - name: Checkout + uses: actions/checkout@v3 + - uses: mlugg/setup-zig@v1 + with: { version: "0.13.0" } - # TODO: figure out a way to cache this - name: Install ShaderC - run: ./.github/workflows/install-shaderc.sh + run: | + sudo apt-get update + sudo apt-get install -y glslc - name: Build for x86_64 Linux glibc - run: ./.github/workflows/actions-build.sh x86_64-linux-gnu + run: zig build -Doptimize=ReleaseSafe -Dsuffix -Dstrip -Dtimestamp -Dtarget=x86_64-linux-gnu - name: Build for x86_64 Linux musl - run: ./.github/workflows/actions-build.sh x86_64-linux-musl + run: zig build -Doptimize=ReleaseSafe -Dsuffix -Dstrip -Dtimestamp -Dtarget=x86_64-linux-musl - name: Build for x86_64 Windows - run: ./.github/workflows/actions-build.sh x86_64-windows + run: zig build -Doptimize=ReleaseSafe -Dsuffix -Dstrip -Dtimestamp -Dtarget=x86_64-windows - uses: actions/upload-artifact@v2 with: diff --git a/.github/workflows/install-shaderc.sh b/.github/workflows/install-shaderc.sh deleted file mode 100755 index bce5206..0000000 --- a/.github/workflows/install-shaderc.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -e -ci_page=https://storage.googleapis.com/shaderc/badges/build_link_linux_clang_release.html -latest_build=$(curl -sSL "$ci_page" | sed 's/.*url=\([^"]*\)".*/\1/;q') -curl -sSLo shaderc.tar.gz "$latest_build" -tar -xzf shaderc.tar.gz -mv install shaderc