Skip to content

Commit 2d2ca91

Browse files
committed
Install CMake ourselves
1 parent e091523 commit 2d2ca91

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

.github/workflows/check.yml

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ name: Check
33
env:
44
# Version here should match the one in React Native template and packages/cmake-rn/src/cli.ts
55
NDK_VERSION: 27.1.12297006
6+
# Building Hermes from source doesn't support CMake v4
7+
CMAKE_VERSION: 3.31.6
68
# Enabling the Gradle test on CI (disabled by default because it downloads a lot)
79
ENABLE_GRADLE_TESTS: true
810

@@ -155,7 +157,7 @@ jobs:
155157
- name: Install compatible CMake version
156158
uses: jwlawson/actions-setup-cmake@v2
157159
with:
158-
cmake-version: "3.31.2"
160+
cmake-version: ${{ env.CMAKE_VERSION }}
159161
- run: rustup target add x86_64-apple-darwin
160162
- run: npm ci
161163
- run: npm run bootstrap
@@ -185,18 +187,7 @@ jobs:
185187
- name: Setup Android SDK
186188
uses: android-actions/setup-android@v3
187189
with:
188-
packages: tools platform-tools ndk;${{ env.NDK_VERSION }}
189-
- name: Remove legacy Android SDK tools
190-
run: |
191-
# Remove legacy tools directory that contains Java 11+ incompatible sdkmanager
192-
# Gradle/RN build uses hardcoded paths to $ANDROID_HOME/tools/bin/sdkmanager
193-
# Must be done after setup-android sets ANDROID_HOME but before build starts
194-
if [ -d "$ANDROID_HOME/tools" ]; then
195-
echo "Removing legacy SDK tools directory (incompatible with Java 11+)"
196-
rm -rf "$ANDROID_HOME/tools"
197-
else
198-
echo "Legacy tools directory not found (already removed or never existed)"
199-
fi
190+
packages: tools platform-tools ndk;${{ env.NDK_VERSION }} cmake;${{ env.CMAKE_VERSION }}
200191
- run: rustup target add x86_64-linux-android aarch64-linux-android armv7-linux-androideabi i686-linux-android aarch64-apple-ios-sim
201192
- run: npm ci
202193
- run: npm run bootstrap

0 commit comments

Comments
 (0)