From 539b6432671adf046d0089d82d6cbc375829b90c Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Tue, 31 May 2022 03:05:34 -0700 Subject: [PATCH] CI: rename macos-gnu target -> macos-none Reflecting breaking change in latest version of Zig Signed-off-by: Stephen Gutekanst --- .github/workflows/ci.yml | 10 +++++----- .github/workflows/m1_ci.yml | 2 +- freetype/.github/workflows/ci.yml | 2 +- gpu-dawn/.github/workflows/ci.yml | 8 ++++---- gpu-dawn/.github/workflows/m1_ci.yml | 8 ++++---- gpu-dawn/build.zig | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 288e7644..a96801eb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,11 +21,11 @@ jobs: sudo apt install xz-utils sudo sh -c 'wget -c https://ziglang.org/builds/zig-linux-x86_64-0.10.0-dev.2439+c84f5a5f9.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' - name: x86_64-linux -> x86_64-macos - run: cd ${{ matrix.project }} && zig build test -Dtarget=x86_64-macos.12...12-gnu + run: cd ${{ matrix.project }} && zig build test -Dtarget=x86_64-macos.12-none env: AGREE: true - name: x86_64-linux -> aarch64-macos - run: cd ${{ matrix.project }} && zig build test -Dtarget=aarch64-macos.12...12-gnu + run: cd ${{ matrix.project }} && zig build test -Dtarget=aarch64-macos.12-none env: AGREE: true - name: x86_64-linux -> x86_64-windows @@ -65,11 +65,11 @@ jobs: 7z x zig.zip Add-Content $env:GITHUB_PATH "C:\zig-windows-x86_64-0.10.0-dev.2017+a0a2ce92c\" - name: x86_64-windows -> x86_64-macos - run: cd ${{ matrix.project }} && zig build test -Dtarget='x86_64-macos.12...12-gnu' + run: cd ${{ matrix.project }} && zig build test -Dtarget='x86_64-macos.12-none' env: AGREE: true - name: x86_64-windows -> aarch64-macos - run: cd ${{ matrix.project }} && zig build test -Dtarget='aarch64-macos.12...12-gnu' + run: cd ${{ matrix.project }} && zig build test -Dtarget='aarch64-macos.12-none' env: AGREE: true - name: x86_64-windows -> x86_64-linux @@ -105,7 +105,7 @@ jobs: # env: # AGREE: true - name: x86_64-macos -> aarch64-macos - run: cd ${{ matrix.project }} && zig build test -Dtarget=aarch64-macos.12...12-gnu + run: cd ${{ matrix.project }} && zig build test -Dtarget=aarch64-macos.12-none env: AGREE: true - name: x86_64-macos -> x86_64-windows diff --git a/.github/workflows/m1_ci.yml b/.github/workflows/m1_ci.yml index 22d2e982..d3d75abb 100644 --- a/.github/workflows/m1_ci.yml +++ b/.github/workflows/m1_ci.yml @@ -33,7 +33,7 @@ jobs: env: AGREE: true - name: aarch64-macos -> x86_64-macos - run: zig build test -Dtarget=x86_64-macos.12-gnu + run: zig build test -Dtarget=x86_64-macos.12-none env: AGREE: true - name: aarch64-macos -> x86_64-windows diff --git a/freetype/.github/workflows/ci.yml b/freetype/.github/workflows/ci.yml index f3fe5554..a9874d8f 100644 --- a/freetype/.github/workflows/ci.yml +++ b/freetype/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: sudo apt install xz-utils sudo sh -c 'wget -c https://ziglang.org/builds/zig-linux-x86_64-0.10.0-dev.2439+c84f5a5f9.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' - name: x86_64-linux -> aarch64-macos - run: zig build test -Dtarget=aarch64-macos.12...12-gnu + run: zig build test -Dtarget=aarch64-macos.12-none - name: test run: | zig build test diff --git a/gpu-dawn/.github/workflows/ci.yml b/gpu-dawn/.github/workflows/ci.yml index cd11ea2a..dcf12bca 100644 --- a/gpu-dawn/.github/workflows/ci.yml +++ b/gpu-dawn/.github/workflows/ci.yml @@ -161,13 +161,13 @@ jobs: - name: Clone mach-glfw run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw - name: install (debug) - run: zig build install -Ddawn-from-source=true -Dtarget=x86_64-macos.12-gnu + run: zig build install -Ddawn-from-source=true -Dtarget=x86_64-macos.12-none env: AGREE: true - name: upload (debug) run: ./dev/upload-release.sh env: - RELEASE_NAME: x86_64-macos-gnu_debug + RELEASE_NAME: x86_64-macos-none_debug GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} x86_64-macos_release-fast: runs-on: macos-latest @@ -185,11 +185,11 @@ jobs: - name: Clone mach-glfw run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw - name: install (release-fast) - run: zig build install -Ddawn-from-source=true -Drelease-fast=true -Dtarget=x86_64-macos.12-gnu + run: zig build install -Ddawn-from-source=true -Drelease-fast=true -Dtarget=x86_64-macos.12-none env: AGREE: true - name: upload (release-fast) run: ./dev/upload-release.sh env: - RELEASE_NAME: x86_64-macos-gnu_release-fast + RELEASE_NAME: x86_64-macos-none_release-fast GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/gpu-dawn/.github/workflows/m1_ci.yml b/gpu-dawn/.github/workflows/m1_ci.yml index 054781d2..7db2fc9c 100644 --- a/gpu-dawn/.github/workflows/m1_ci.yml +++ b/gpu-dawn/.github/workflows/m1_ci.yml @@ -25,21 +25,21 @@ jobs: - name: Clone mach-glfw run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw - name: install (debug) - run: zig build install -Ddawn-from-source=true -Dtarget=aarch64-macos.12-gnu + run: zig build install -Ddawn-from-source=true -Dtarget=aarch64-macos.12-none env: AGREE: true - name: upload (debug) run: ./dev/upload-release.sh env: - RELEASE_NAME: aarch64-macos-gnu_debug + RELEASE_NAME: aarch64-macos-none_debug GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: install (release-fast) - run: zig build install -Ddawn-from-source=true -Drelease-fast=true -Dtarget=aarch64-macos.12-gnu + run: zig build install -Ddawn-from-source=true -Drelease-fast=true -Dtarget=aarch64-macos.12-none env: AGREE: true - name: upload (release-fast) run: ./dev/upload-release.sh env: - RELEASE_NAME: aarch64-macos-gnu_release-fast + RELEASE_NAME: aarch64-macos-none_release-fast UPLOAD_HEADERS: true GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/gpu-dawn/build.zig b/gpu-dawn/build.zig index 2ff3db47..48ac569b 100644 --- a/gpu-dawn/build.zig +++ b/gpu-dawn/build.zig @@ -323,7 +323,7 @@ fn downloadBinary( const github_triple = try std.mem.replaceOwned(u8, allocator, zig_triple, "...", "---"); // Compose the download URL, e.g.: - // https://github.com/hexops/mach-gpu-dawn/releases/download/release-6b59025/libdawn_x86_64-macos-gnu_debug.a.gz + // https://github.com/hexops/mach-gpu-dawn/releases/download/release-6b59025/libdawn_x86_64-macos-none_debug.a.gz const lib_prefix = if (is_windows) "dawn_" else "libdawn_"; const lib_ext = if (is_windows) ".lib" else ".a"; const lib_file_name = if (is_windows) "dawn.lib" else "libdawn.a";