From 948da76a1e28d0a5f998eff7c2dc2517e5ac7cd0 Mon Sep 17 00:00:00 2001 From: Qijia Liu Date: Mon, 15 Sep 2025 22:22:01 -0400 Subject: [PATCH] use macos-26 --- .github/workflows/ci.yml | 16 ++++------------ fcitx5 | 2 +- fcitx5-webview | 2 +- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c9c0a7f..c5396e2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ on: jobs: lint: - runs-on: macos-15 + runs-on: macos-26 steps: - uses: actions/checkout@v5 with: @@ -25,7 +25,7 @@ jobs: build: needs: lint - runs-on: macos-15 + runs-on: macos-26 strategy: fail-fast: false matrix: @@ -40,13 +40,7 @@ jobs: with: submodules: recursive - - uses: maxim-lobanov/setup-xcode@v1 - with: - xcode-version: 16.4 - - - uses: lukka/get-cmake@v4.0.3 - - - uses: actions/setup-node@v4 + - uses: actions/setup-node@v5 with: node-version: 24.x @@ -59,8 +53,7 @@ jobs: nlohmann-json \ extra-cmake-modules \ librsvg \ - md5sha1sum \ - ninja + md5sha1sum ./scripts/install-deps.sh ${{ matrix.arch }} npm i -g pnpm pnpm --prefix=fcitx5-webview i @@ -73,7 +66,6 @@ jobs: git fetch --tags -f # Don't log key on any CI artifact. cmake -B build/${{ matrix.arch }} -G Ninja \ - -DCMAKE_Swift_COMPILER=`which swiftc` \ -DKEY_LOGGING=OFF \ -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} \ -DCMAKE_BUILD_TYPE=${{ matrix.type }} diff --git a/fcitx5 b/fcitx5 index 9b14d6f..b45087b 160000 --- a/fcitx5 +++ b/fcitx5 @@ -1 +1 @@ -Subproject commit 9b14d6ff07f1ffcc44f37b7f8a3367211001fd3b +Subproject commit b45087bcf0f79e83c3963c1df377fdab2ca8cd4a diff --git a/fcitx5-webview b/fcitx5-webview index 7ec807d..1a7182e 160000 --- a/fcitx5-webview +++ b/fcitx5-webview @@ -1 +1 @@ -Subproject commit 7ec807d40e824022ea8571d5567f066cc9bcceb7 +Subproject commit 1a7182e42b39a6089c4198044cfa97aef529afba