From b282641300be96f21849272f970fe77b970cd992 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Sat, 10 Sep 2022 02:13:27 +0000 Subject: [PATCH] all: update to latest Zig nightly version Performed via: ```sh VERSION=0.10.0-dev.3952+9e070b653 ./dev/update-zig.sh ``` Signed-off-by: Stephen Gutekanst --- .github/workflows/ci.yml | 6 +++--- .github/workflows/m1_ci.yml | 2 +- README.md | 10 +++++----- dev/template/.github/workflows/ci.yml | 8 ++++---- dev/update-zig.sh | 2 +- libs/basisu/.github/workflows/ci.yml | 8 ++++---- libs/freetype/.github/workflows/ci.yml | 8 ++++---- libs/glfw/.github/workflows/ci.yml | 8 ++++---- libs/glfw/.github/workflows/m1_ci.yml | 2 +- libs/gpu-dawn/.github/workflows/ci.yml | 20 ++++++++++---------- libs/gpu-dawn/.github/workflows/m1_ci.yml | 2 +- 11 files changed, 38 insertions(+), 38 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 549e04b1..44217be4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: - name: Setup Zig run: | sudo apt install xz-utils libasound2-dev - sudo sh -c 'wget -c https://ziglang.org/builds/zig-linux-x86_64-0.10.0-dev.3842+36f4f32fa.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' + sudo sh -c 'wget -c https://ziglang.org/builds/zig-linux-x86_64-0.10.0-dev.3952+9e070b653.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' # - name: x86_64-linux -> x86_64-linux-musl # if: matrix.project == 'libs/freetype' || matrix.project == 'libs/glfw' # run: cd ${{ matrix.project }} && zig build -Dtarget=x86_64-linux-musl @@ -61,7 +61,7 @@ jobs: - name: Setup Zig run: | $ProgressPreference = 'SilentlyContinue' - Invoke-WebRequest -Uri 'https://ziglang.org/builds/zig-windows-x86_64-0.10.0-dev.3842+36f4f32fa.zip' -OutFile 'C:\zig.zip' + Invoke-WebRequest -Uri 'https://ziglang.org/builds/zig-windows-x86_64-0.10.0-dev.3952+9e070b653.zip' -OutFile 'C:\zig.zip' cd C:\ 7z x zig.zip Add-Content $env:GITHUB_PATH 'C:\zig-windows-x86_64-0.10.0-dev.3027+0e26c6149\' @@ -81,7 +81,7 @@ jobs: run: | brew uninstall --ignore-dependencies libx11 # https://github.com/ziglang/zig/issues/11066 brew install xz - sudo sh -c 'wget -c https://ziglang.org/builds/zig-macos-x86_64-0.10.0-dev.3842+36f4f32fa.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' + sudo sh -c 'wget -c https://ziglang.org/builds/zig-macos-x86_64-0.10.0-dev.3952+9e070b653.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' - name: test run: zig build test env: diff --git a/.github/workflows/m1_ci.yml b/.github/workflows/m1_ci.yml index 66e3e552..5eca4898 100644 --- a/.github/workflows/m1_ci.yml +++ b/.github/workflows/m1_ci.yml @@ -24,7 +24,7 @@ jobs: - name: Setup Zig run: | sudo rm -rf /usr/local/bin/zig /usr/local/bin/lib/ - sudo sh -c 'wget -c https://ziglang.org/builds/zig-macos-aarch64-0.10.0-dev.3842+36f4f32fa.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' + sudo sh -c 'wget -c https://ziglang.org/builds/zig-macos-aarch64-0.10.0-dev.3952+9e070b653.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' - name: mach::test run: zig build test env: diff --git a/README.md b/README.md index 6d84b784..f6cf5ea4 100644 --- a/README.md +++ b/README.md @@ -74,14 +74,14 @@ Mach is still early stages, so far we have support for building from the followi Zig has switched to the self-hosted compiler recently. This is a huge milestone, but currently means that Zig nightly versions are a little bit unstable. For now, we suggest using a slightly older Zig version before the switch to the self-hosted compiler. -Currently tested with: 0.10.0-dev.3842+36f4f32fa +Currently tested with: 0.10.0-dev.3952+9e070b653 You can download binary releases of this version at: -* **linux-x86_64**: https://ziglang.org/builds/zig-linux-x86_64-0.10.0-dev.3842+36f4f32fa.tar.xz) -* **windows-x86_64**: https://ziglang.org/builds/zig-windows-x86_64-0.10.0-dev.3842+36f4f32fa.zip -* **macos-x86_64** (Intel): https://ziglang.org/builds/zig-macos-x86_64-0.10.0-dev.3842+36f4f32fa.tar.xz -* **macos-aarch64** (Apple Silicon): https://ziglang.org/builds/zig-macos-aarch64-0.10.0-dev.3842+36f4f32fa.tar.xz +* **linux-x86_64**: https://ziglang.org/builds/zig-linux-x86_64-0.10.0-dev.3952+9e070b653.tar.xz) +* **windows-x86_64**: https://ziglang.org/builds/zig-windows-x86_64-0.10.0-dev.3952+9e070b653.zip +* **macos-x86_64** (Intel): https://ziglang.org/builds/zig-macos-x86_64-0.10.0-dev.3952+9e070b653.tar.xz +* **macos-aarch64** (Apple Silicon): https://ziglang.org/builds/zig-macos-aarch64-0.10.0-dev.3952+9e070b653.tar.xz You can subscribe to [issue #180](https://github.com/hexops/mach/issues/180) for how we're tracking towards support for the latest nightly version of Zig. diff --git a/dev/template/.github/workflows/ci.yml b/dev/template/.github/workflows/ci.yml index 9f4c681f..57b125ea 100644 --- a/dev/template/.github/workflows/ci.yml +++ b/dev/template/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: - name: Setup Zig run: | sudo apt install xz-utils - sudo sh -c 'wget -c https://ziglang.org/builds/zig-linux-x86_64-0.10.0-dev.3842+36f4f32fa.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' + sudo sh -c 'wget -c https://ziglang.org/builds/zig-linux-x86_64-0.10.0-dev.3952+9e070b653.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-none - name: test @@ -27,10 +27,10 @@ jobs: - name: Setup Zig run: | $ProgressPreference = 'SilentlyContinue' - Invoke-WebRequest -Uri "https://ziglang.org/builds/zig-windows-x86_64-0.10.0-dev.3842+36f4f32fa.zip" -OutFile "C:\zig.zip" + Invoke-WebRequest -Uri "https://ziglang.org/builds/zig-windows-x86_64-0.10.0-dev.3952+9e070b653.zip" -OutFile "C:\zig.zip" cd C:\ 7z x zig.zip - Add-Content $env:GITHUB_PATH "C:\zig-windows-x86_64-0.10.0-dev.3842+36f4f32fa\" + Add-Content $env:GITHUB_PATH "C:\zig-windows-x86_64-0.10.0-dev.3952+9e070b653\" - name: test run: zig build test x86_64-macos: @@ -41,6 +41,6 @@ jobs: - name: Setup Zig run: | brew install xz - sudo sh -c 'wget -c https://ziglang.org/builds/zig-macos-x86_64-0.10.0-dev.3842+36f4f32fa.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' + sudo sh -c 'wget -c https://ziglang.org/builds/zig-macos-x86_64-0.10.0-dev.3952+9e070b653.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' - name: test run: zig build test diff --git a/dev/update-zig.sh b/dev/update-zig.sh index cec4f4fb..fb974642 100755 --- a/dev/update-zig.sh +++ b/dev/update-zig.sh @@ -22,7 +22,7 @@ if [ -n "${ZIG_VERSION:-}" ]; then update_zig "$version" README.md - sources=$(find . | grep './.github/workflows' | grep -v 'third_party/' | grep -v 'DirectXShaderCompiler' | grep -v '/libs/' | grep '\.yml') + sources=$(find . | grep './.github/workflows' | grep -v 'third_party/' | grep -v 'DirectXShaderCompiler' | grep '\.yml') echo "$sources" | while read line ; do update_zig "$version" "$line" ; done else echo "must specify e.g. ZIG_VERSION=0.10.0-dev.2017+a0a2ce92c" diff --git a/libs/basisu/.github/workflows/ci.yml b/libs/basisu/.github/workflows/ci.yml index c3c325e3..57b125ea 100644 --- a/libs/basisu/.github/workflows/ci.yml +++ b/libs/basisu/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: - name: Setup Zig run: | sudo apt install xz-utils - sudo sh -c 'wget -c https://ziglang.org/builds/zig-linux-x86_64-0.10.0-dev.3551+92568a009.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' + sudo sh -c 'wget -c https://ziglang.org/builds/zig-linux-x86_64-0.10.0-dev.3952+9e070b653.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-none - name: test @@ -27,10 +27,10 @@ jobs: - name: Setup Zig run: | $ProgressPreference = 'SilentlyContinue' - Invoke-WebRequest -Uri "https://ziglang.org/builds/zig-windows-x86_64-0.10.0-dev.3551+92568a009.zip" -OutFile "C:\zig.zip" + Invoke-WebRequest -Uri "https://ziglang.org/builds/zig-windows-x86_64-0.10.0-dev.3952+9e070b653.zip" -OutFile "C:\zig.zip" cd C:\ 7z x zig.zip - Add-Content $env:GITHUB_PATH "C:\zig-windows-x86_64-0.10.0-dev.3551+92568a009\" + Add-Content $env:GITHUB_PATH "C:\zig-windows-x86_64-0.10.0-dev.3952+9e070b653\" - name: test run: zig build test x86_64-macos: @@ -41,6 +41,6 @@ jobs: - name: Setup Zig run: | brew install xz - sudo sh -c 'wget -c https://ziglang.org/builds/zig-macos-x86_64-0.10.0-dev.3551+92568a009.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' + sudo sh -c 'wget -c https://ziglang.org/builds/zig-macos-x86_64-0.10.0-dev.3952+9e070b653.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' - name: test run: zig build test diff --git a/libs/freetype/.github/workflows/ci.yml b/libs/freetype/.github/workflows/ci.yml index c3c325e3..57b125ea 100644 --- a/libs/freetype/.github/workflows/ci.yml +++ b/libs/freetype/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: - name: Setup Zig run: | sudo apt install xz-utils - sudo sh -c 'wget -c https://ziglang.org/builds/zig-linux-x86_64-0.10.0-dev.3551+92568a009.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' + sudo sh -c 'wget -c https://ziglang.org/builds/zig-linux-x86_64-0.10.0-dev.3952+9e070b653.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-none - name: test @@ -27,10 +27,10 @@ jobs: - name: Setup Zig run: | $ProgressPreference = 'SilentlyContinue' - Invoke-WebRequest -Uri "https://ziglang.org/builds/zig-windows-x86_64-0.10.0-dev.3551+92568a009.zip" -OutFile "C:\zig.zip" + Invoke-WebRequest -Uri "https://ziglang.org/builds/zig-windows-x86_64-0.10.0-dev.3952+9e070b653.zip" -OutFile "C:\zig.zip" cd C:\ 7z x zig.zip - Add-Content $env:GITHUB_PATH "C:\zig-windows-x86_64-0.10.0-dev.3551+92568a009\" + Add-Content $env:GITHUB_PATH "C:\zig-windows-x86_64-0.10.0-dev.3952+9e070b653\" - name: test run: zig build test x86_64-macos: @@ -41,6 +41,6 @@ jobs: - name: Setup Zig run: | brew install xz - sudo sh -c 'wget -c https://ziglang.org/builds/zig-macos-x86_64-0.10.0-dev.3551+92568a009.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' + sudo sh -c 'wget -c https://ziglang.org/builds/zig-macos-x86_64-0.10.0-dev.3952+9e070b653.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' - name: test run: zig build test diff --git a/libs/glfw/.github/workflows/ci.yml b/libs/glfw/.github/workflows/ci.yml index 38fca912..a860da55 100644 --- a/libs/glfw/.github/workflows/ci.yml +++ b/libs/glfw/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: - name: Setup Zig run: | sudo apt install xz-utils - sudo sh -c 'wget -c https://ziglang.org/builds/zig-linux-x86_64-0.10.0-dev.3551+92568a009.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' + sudo sh -c 'wget -c https://ziglang.org/builds/zig-linux-x86_64-0.10.0-dev.3952+9e070b653.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' - name: x86_64-linux -> x86_64-macos run: zig build test -Dtarget=x86_64-macos env: @@ -48,10 +48,10 @@ jobs: - name: Setup Zig run: | $ProgressPreference = 'SilentlyContinue' - Invoke-WebRequest -Uri "https://ziglang.org/builds/zig-windows-x86_64-0.10.0-dev.3551+92568a009.zip" -OutFile "C:\zig.zip" + Invoke-WebRequest -Uri "https://ziglang.org/builds/zig-windows-x86_64-0.10.0-dev.3952+9e070b653.zip" -OutFile "C:\zig.zip" cd C:\ 7z x zig.zip - Add-Content $env:GITHUB_PATH "C:\zig-windows-x86_64-0.10.0-dev.3551+92568a009\" + Add-Content $env:GITHUB_PATH "C:\zig-windows-x86_64-0.10.0-dev.3952+9e070b653\" - name: x86_64-windows -> x86_64-macos run: zig build test -Dtarget=x86_64-macos env: @@ -76,7 +76,7 @@ jobs: run: | brew uninstall --ignore-dependencies libx11 # https://github.com/ziglang/zig/issues/11066 brew install xz - sudo sh -c 'wget -c https://ziglang.org/builds/zig-macos-x86_64-0.10.0-dev.3551+92568a009.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' + sudo sh -c 'wget -c https://ziglang.org/builds/zig-macos-x86_64-0.10.0-dev.3952+9e070b653.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' - name: test run: zig build test env: diff --git a/libs/glfw/.github/workflows/m1_ci.yml b/libs/glfw/.github/workflows/m1_ci.yml index e0e3dbb2..75c3299c 100644 --- a/libs/glfw/.github/workflows/m1_ci.yml +++ b/libs/glfw/.github/workflows/m1_ci.yml @@ -24,7 +24,7 @@ jobs: - name: Setup Zig run: | sudo rm -rf /usr/local/bin/zig /usr/local/bin/lib/ - sudo sh -c 'wget -c https://ziglang.org/builds/zig-macos-aarch64-0.10.0-dev.3551+92568a009.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' + sudo sh -c 'wget -c https://ziglang.org/builds/zig-macos-aarch64-0.10.0-dev.3952+9e070b653.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' - name: test run: zig build test env: diff --git a/libs/gpu-dawn/.github/workflows/ci.yml b/libs/gpu-dawn/.github/workflows/ci.yml index 8e47426e..0a4e3167 100644 --- a/libs/gpu-dawn/.github/workflows/ci.yml +++ b/libs/gpu-dawn/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: - name: Setup Zig run: | sudo apt install xz-utils - sudo sh -c 'wget -c https://ziglang.org/builds/zig-linux-x86_64-0.10.0-dev.3551+92568a009.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' + sudo sh -c 'wget -c https://ziglang.org/builds/zig-linux-x86_64-0.10.0-dev.3952+9e070b653.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' - name: Clone mach-glfw run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw - name: install (debug) @@ -37,7 +37,7 @@ jobs: - name: Setup Zig run: | sudo apt install xz-utils - sudo sh -c 'wget -c https://ziglang.org/builds/zig-linux-x86_64-0.10.0-dev.3551+92568a009.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' + sudo sh -c 'wget -c https://ziglang.org/builds/zig-linux-x86_64-0.10.0-dev.3952+9e070b653.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' - name: Clone mach-glfw run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw - name: install (release-fast) @@ -58,7 +58,7 @@ jobs: - name: Setup Zig run: | sudo apt install xz-utils - sudo sh -c 'wget -c https://ziglang.org/builds/zig-linux-x86_64-0.10.0-dev.3551+92568a009.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' + sudo sh -c 'wget -c https://ziglang.org/builds/zig-linux-x86_64-0.10.0-dev.3952+9e070b653.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' - name: Clone mach-glfw run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw - name: install (debug) @@ -79,7 +79,7 @@ jobs: - name: Setup Zig run: | sudo apt install xz-utils - sudo sh -c 'wget -c https://ziglang.org/builds/zig-linux-x86_64-0.10.0-dev.3551+92568a009.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' + sudo sh -c 'wget -c https://ziglang.org/builds/zig-linux-x86_64-0.10.0-dev.3952+9e070b653.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' - name: Clone mach-glfw run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw - name: install (release-fast) @@ -102,10 +102,10 @@ jobs: - name: Setup Zig run: | $ProgressPreference = 'SilentlyContinue' - Invoke-WebRequest -Uri "https://ziglang.org/builds/zig-windows-x86_64-0.10.0-dev.3551+92568a009.zip" -OutFile "C:\zig.zip" + Invoke-WebRequest -Uri "https://ziglang.org/builds/zig-windows-x86_64-0.10.0-dev.3952+9e070b653.zip" -OutFile "C:\zig.zip" cd C:\ 7z x zig.zip - Add-Content $env:GITHUB_PATH "C:\zig-windows-x86_64-0.10.0-dev.3551+92568a009\" + Add-Content $env:GITHUB_PATH "C:\zig-windows-x86_64-0.10.0-dev.3952+9e070b653\" - name: Clone mach-glfw run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw - name: install (debug) @@ -130,10 +130,10 @@ jobs: - name: Setup Zig run: | $ProgressPreference = 'SilentlyContinue' - Invoke-WebRequest -Uri "https://ziglang.org/builds/zig-windows-x86_64-0.10.0-dev.3551+92568a009.zip" -OutFile "C:\zig.zip" + Invoke-WebRequest -Uri "https://ziglang.org/builds/zig-windows-x86_64-0.10.0-dev.3952+9e070b653.zip" -OutFile "C:\zig.zip" cd C:\ 7z x zig.zip - Add-Content $env:GITHUB_PATH "C:\zig-windows-x86_64-0.10.0-dev.3551+92568a009\" + Add-Content $env:GITHUB_PATH "C:\zig-windows-x86_64-0.10.0-dev.3952+9e070b653\" - name: Clone mach-glfw run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw - name: install (release-fast) @@ -157,7 +157,7 @@ jobs: run: | brew uninstall --ignore-dependencies libx11 # https://github.com/ziglang/zig/issues/11066 brew install xz - sudo sh -c 'wget -c https://ziglang.org/builds/zig-macos-x86_64-0.10.0-dev.3551+92568a009.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' + sudo sh -c 'wget -c https://ziglang.org/builds/zig-macos-x86_64-0.10.0-dev.3952+9e070b653.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' - name: Clone mach-glfw run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw - name: install (debug) @@ -181,7 +181,7 @@ jobs: run: | brew uninstall --ignore-dependencies libx11 # https://github.com/ziglang/zig/issues/11066 brew install xz - sudo sh -c 'wget -c https://ziglang.org/builds/zig-macos-x86_64-0.10.0-dev.3551+92568a009.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' + sudo sh -c 'wget -c https://ziglang.org/builds/zig-macos-x86_64-0.10.0-dev.3952+9e070b653.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' - name: Clone mach-glfw run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw - name: install (release-fast) diff --git a/libs/gpu-dawn/.github/workflows/m1_ci.yml b/libs/gpu-dawn/.github/workflows/m1_ci.yml index fb83514a..2de858ae 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: Setup Zig run: | sudo rm -rf /usr/local/bin/zig /usr/local/bin/lib/ - sudo sh -c 'wget -c https://ziglang.org/builds/zig-macos-aarch64-0.10.0-dev.3551+92568a009.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' + sudo sh -c 'wget -c https://ziglang.org/builds/zig-macos-aarch64-0.10.0-dev.3952+9e070b653.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' - name: Clone mach-glfw run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw - name: install (debug)