Skip to content

Commit 61a5437

Browse files
committed
ci: adopt main's test-android gating and CMake-pin removal after rebase
Reconcile the pnpm-migrated check.yml with two changes that landed on main while this branch was in review: - #382 fixed the CMake 4.2 framework-HEADERS root cause in weak-node-api/CMakeLists.txt (included via the rebase) and removed the now-redundant "Install compatible CMake version" pin from all five macOS jobs. Drop those steps here too; CMAKE_VERSION is retained since test-android still uses it to select the Android SDK cmake package. - #380 gated test-android to labeled PRs only (the ubuntu-self-hosted runner is offline and otherwise leaves the job queued forever on main). With this, check.yml differs from main purely by the pnpm conversion. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01DnwodAoNbqPec77191HVXn
1 parent 169c2dd commit 61a5437

1 file changed

Lines changed: 5 additions & 27 deletions

File tree

.github/workflows/check.yml

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,6 @@ jobs:
103103
with:
104104
packages: tools platform-tools ndk;${{ env.NDK_VERSION }}
105105
- run: rustup target add x86_64-linux-android aarch64-linux-android armv7-linux-androideabi i686-linux-android aarch64-apple-ios-sim
106-
# macOS runners ship a newer CMake than the project supports; pin it to match the version used elsewhere in CI
107-
- name: Install compatible CMake version
108-
if: runner.os == 'macOS'
109-
uses: jwlawson/actions-setup-cmake@v2
110-
with:
111-
cmake-version: ${{ env.CMAKE_VERSION }}
112106
- run: pnpm install
113107
- run: pnpm run bootstrap
114108
- run: pnpm test
@@ -138,12 +132,6 @@ jobs:
138132
uses: hendrikmuhs/ccache-action@v1.2
139133
with:
140134
key: ${{ github.job }}-${{ runner.os }}
141-
# macOS runners ship a newer CMake than the project supports; pin it to match the version used elsewhere in CI
142-
- name: Install compatible CMake version
143-
if: runner.os == 'macOS'
144-
uses: jwlawson/actions-setup-cmake@v2
145-
with:
146-
cmake-version: ${{ env.CMAKE_VERSION }}
147135
- run: pnpm install
148136
- run: pnpm run build
149137
- name: Prepare weak-node-api
@@ -183,11 +171,6 @@ jobs:
183171
with:
184172
packages: tools platform-tools ndk;${{ env.NDK_VERSION }}
185173
- run: rustup target add x86_64-linux-android aarch64-linux-android armv7-linux-androideabi i686-linux-android aarch64-apple-ios-sim
186-
# macOS runners ship a newer CMake than the project supports; pin it to match the version used elsewhere in CI
187-
- name: Install compatible CMake version
188-
uses: jwlawson/actions-setup-cmake@v2
189-
with:
190-
cmake-version: ${{ env.CMAKE_VERSION }}
191174
- run: pnpm install
192175
- run: pnpm run bootstrap
193176
env:
@@ -226,10 +209,6 @@ jobs:
226209
with:
227210
java-version: "17"
228211
distribution: "temurin"
229-
- name: Install compatible CMake version
230-
uses: jwlawson/actions-setup-cmake@v2
231-
with:
232-
cmake-version: ${{ env.CMAKE_VERSION }}
233212
- run: rustup target add x86_64-apple-darwin
234213
- run: pnpm install
235214
- run: pnpm run bootstrap
@@ -251,7 +230,11 @@ jobs:
251230
env:
252231
MOCHA_REMOTE_CONTEXT: allTests
253232
test-android:
254-
if: github.ref == 'refs/heads/main' || contains(github.event.pull_request.labels.*.name, 'Android 🤖')
233+
# Temporarily gated to labeled PRs only: the ubuntu-self-hosted runner is
234+
# offline, so running this on main pushes leaves the job queued forever and
235+
# blocks the whole Check run from completing. Re-enable on main once the
236+
# self-hosted runner is back. Tracked in #379.
237+
if: contains(github.event.pull_request.labels.*.name, 'Android 🤖')
255238
name: Test app (Android)
256239
runs-on: ubuntu-self-hosted
257240
steps:
@@ -366,11 +349,6 @@ jobs:
366349
distribution: "temurin"
367350
- run: rustup target add x86_64-apple-darwin x86_64-apple-ios aarch64-apple-ios aarch64-apple-ios-sim
368351
- run: rustup toolchain install nightly --component rust-src
369-
# macOS runners ship a newer CMake than the project supports; pin it to match the version used elsewhere in CI
370-
- name: Install compatible CMake version
371-
uses: jwlawson/actions-setup-cmake@v2
372-
with:
373-
cmake-version: ${{ env.CMAKE_VERSION }}
374352
- run: pnpm install
375353
- run: pnpm run build
376354
- name: Build weak-node-api for all Apple architectures

0 commit comments

Comments
 (0)