From d2ca4391e919dcddf640d4923c2544741b04ee45 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Sun, 25 Jun 2023 00:38:45 -0700 Subject: [PATCH] all: update macOS target triples Signed-off-by: Stephen Gutekanst --- libs/basisu/.github/workflows/ci.yml | 2 +- libs/core/.github/workflows/ci.yml | 2 +- libs/freetype/.github/workflows/ci.yml | 2 +- libs/gpu-dawn/.github/workflows/m1_ci.yml | 4 ++-- libs/gpu-dawn/README.md | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/basisu/.github/workflows/ci.yml b/libs/basisu/.github/workflows/ci.yml index cf2fbec3..6e1e4030 100644 --- a/libs/basisu/.github/workflows/ci.yml +++ b/libs/basisu/.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.11.0-dev.3798+a5e15eced.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' - name: x86_64-linux -> aarch64-macos - run: zig build -Dtarget=aarch64-macos.12-none + run: zig build -Dtarget=aarch64-macos - name: test run: | zig build test diff --git a/libs/core/.github/workflows/ci.yml b/libs/core/.github/workflows/ci.yml index cf2fbec3..6e1e4030 100644 --- a/libs/core/.github/workflows/ci.yml +++ b/libs/core/.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.11.0-dev.3798+a5e15eced.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' - name: x86_64-linux -> aarch64-macos - run: zig build -Dtarget=aarch64-macos.12-none + run: zig build -Dtarget=aarch64-macos - name: test run: | zig build test diff --git a/libs/freetype/.github/workflows/ci.yml b/libs/freetype/.github/workflows/ci.yml index 815d3cf5..aa925305 100644 --- a/libs/freetype/.github/workflows/ci.yml +++ b/libs/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.11.0-dev.3798+a5e15eced.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' - name: x86_64-linux -> aarch64-macos - run: zig build -Dtarget=aarch64-macos.12-none + run: zig build -Dtarget=aarch64-macos - name: test run: zig build test x86_64-windows: diff --git a/libs/gpu-dawn/.github/workflows/m1_ci.yml b/libs/gpu-dawn/.github/workflows/m1_ci.yml index ba68761b..1b8a22a4 100644 --- a/libs/gpu-dawn/.github/workflows/m1_ci.yml +++ b/libs/gpu-dawn/.github/workflows/m1_ci.yml @@ -21,7 +21,7 @@ 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 -Dtarget=aarch64-macos.12-none + run: zig build install -Dtarget=aarch64-macos env: AGREE: true - name: upload (debug) @@ -34,7 +34,7 @@ jobs: RELEASE_NAME: aarch64-macos-none_debug GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: install (release-fast) - run: zig build install -Doptimize=ReleaseFast -Dtarget=aarch64-macos.12-none + run: zig build install -Doptimize=ReleaseFast -Dtarget=aarch64-macos env: AGREE: true - name: upload (release-fast) diff --git a/libs/gpu-dawn/README.md b/libs/gpu-dawn/README.md index 0e304e3d..6a08a956 100644 --- a/libs/gpu-dawn/README.md +++ b/libs/gpu-dawn/README.md @@ -32,8 +32,8 @@ This will take ~10 minutes to finish (see the 'binary releases' section below.) | Option | Description | |-------------------------------|------------------------------------------------------------| | `-Doptimize=ReleaseFast` | Build a release binary instead of a debug binary (default) | -| `-Dtarget=x86_64-macos.12` | Cross compile to macOS (Intel chipsets) | -| `-Dtarget=aarch64-macos.12` | Cross compile to macOS (Apple Silicon) | +| `-Dtarget=x86_64-macos` | Cross compile to macOS (Intel chipsets) | +| `-Dtarget=aarch64-macos` | Cross compile to macOS (Apple Silicon) | | `-Dtarget=x86_64-linux-gnu` | Cross compile to x86_64 Linux (glibc) | | `-Dtarget=x86_64-linux-musl` | Cross compile to x86_64 Linux (musl libc) | | `-Dtarget=x86_64-windows-gnu` | Cross compile to x86_64 Windows |