From bf67e156d1920f4f4797841511bc55908a905101 Mon Sep 17 00:00:00 2001 From: Kyle Date: Sun, 27 Sep 2026 15:41:32 +0800 Subject: [PATCH] fix(compute): adopt observer removal fix --- .github/workflows/ubuntu.yml | 2 +- Renderer/Stdout/README.md | 2 +- Renderer/Stdout/configure-env.sh | 2 +- Scripts/CI/compute_setup.sh | 2 +- mise.compute.toml | 5 +++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 278596b16..944469a4d 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -42,7 +42,7 @@ jobs: OPENSWIFTUI_OPENATTRIBUTESHIMS_ATTRIBUTEGRAPH: 0 OPENSWIFTUI_OPENATTRIBUTESHIMS_COMPUTE: ${{ matrix.backend == 'IAG' && '1' || '0' }} OPENSWIFTUI_OPENATTRIBUTESHIMS_COMPUTE_BINARY: 0 - OPENSWIFTUI_OPENATTRIBUTESHIMS_COMPUTE_SOURCE_VERSION: "0.5.2-bugfix.1" + OPENSWIFTUI_OPENATTRIBUTESHIMS_COMPUTE_SOURCE_VERSION: "0.5.2-bugfix.2" OPENSWIFTUI_COMPATIBILITY_TEST: 0 OPENSWIFTUI_SWIFT_LOG: 1 OPENSWIFTUI_SWIFT_CRYPTO: 1 diff --git a/Renderer/Stdout/README.md b/Renderer/Stdout/README.md index 6e295c748..da517db9e 100644 --- a/Renderer/Stdout/README.md +++ b/Renderer/Stdout/README.md @@ -45,7 +45,7 @@ selected toolchain without changing the package's linker settings. When running the executable directly, include the toolchain's `usr/lib` in `LD_LIBRARY_PATH` if it is outside the system library directories. -Compute is built from source at `0.5.2-bugfix.1` by default, matching +Compute is built from source at `0.5.2-bugfix.2` by default, matching `mise.compute.toml`. Set `OPENSWIFTUI_OPENATTRIBUTESHIMS_COMPUTE_SOURCE_VERSION` to select another version. With local dependencies enabled, check out that version in the sibling Compute repository instead. diff --git a/Renderer/Stdout/configure-env.sh b/Renderer/Stdout/configure-env.sh index 863d407f8..8970579de 100644 --- a/Renderer/Stdout/configure-env.sh +++ b/Renderer/Stdout/configure-env.sh @@ -9,7 +9,7 @@ Darwin) *) export OPENSWIFTUI_OPENATTRIBUTESHIMS_ATTRIBUTEGRAPH="${OPENSWIFTUI_OPENATTRIBUTESHIMS_ATTRIBUTEGRAPH:-0}" export OPENSWIFTUI_OPENATTRIBUTESHIMS_COMPUTE="${OPENSWIFTUI_OPENATTRIBUTESHIMS_COMPUTE:-1}" - export OPENSWIFTUI_OPENATTRIBUTESHIMS_COMPUTE_SOURCE_VERSION="${OPENSWIFTUI_OPENATTRIBUTESHIMS_COMPUTE_SOURCE_VERSION:-0.5.2-bugfix.1}" + export OPENSWIFTUI_OPENATTRIBUTESHIMS_COMPUTE_SOURCE_VERSION="${OPENSWIFTUI_OPENATTRIBUTESHIMS_COMPUTE_SOURCE_VERSION:-0.5.2-bugfix.2}" if [[ -z "${OPENSWIFTUI_LIB_SWIFT_PATH:-}" ]]; then swift_binary="$(readlink -f "$(command -v swift)")" if [[ "$(basename "$swift_binary")" == "swiftly" ]]; then diff --git a/Scripts/CI/compute_setup.sh b/Scripts/CI/compute_setup.sh index 3291f9cbd..a522e581f 100755 --- a/Scripts/CI/compute_setup.sh +++ b/Scripts/CI/compute_setup.sh @@ -14,7 +14,7 @@ clone_checkout_compute() { revision=$(Scripts/CI/get_revision.sh compute 2>/dev/null || true) fi if [ -z "$revision" ]; then - revision="0.5.2" + revision="0.5.2-bugfix.2" fi cd .. if [ ! -d Compute ]; then diff --git a/mise.compute.toml b/mise.compute.toml index 0fdd71d7b..fff6946ba 100644 --- a/mise.compute.toml +++ b/mise.compute.toml @@ -5,8 +5,9 @@ tuist = "4.206.0" TUIST_USE_SWIFTERPM=1 OPENSWIFTUI_OPENATTRIBUTESHIMS_ATTRIBUTEGRAPH = "0" OPENSWIFTUI_OPENATTRIBUTESHIMS_COMPUTE = "1" -OPENSWIFTUI_OPENATTRIBUTESHIMS_COMPUTE_BINARY = { default = "1" } +# Use source builds until a new binary release includes the observer removal fix. +OPENSWIFTUI_OPENATTRIBUTESHIMS_COMPUTE_BINARY = { default = "0" } OPENSWIFTUI_OPENATTRIBUTESHIMS_COMPUTE_BINARY_VERSION = "0.5.2" OPENSWIFTUI_OPENATTRIBUTESHIMS_COMPUTE_BINARY_CHECKSUM = "0eca53a3620776cffcc3d2047d11efaf893b53078b95e59e793f86caa3f2c169" -OPENSWIFTUI_OPENATTRIBUTESHIMS_COMPUTE_SOURCE_VERSION = "0.5.2-bugfix.1" +OPENSWIFTUI_OPENATTRIBUTESHIMS_COMPUTE_SOURCE_VERSION = "0.5.2-bugfix.2" # OPENSWIFTUI_USE_LOCAL_DEPS = "1"