Skip to content

Commit 821c7d8

Browse files
authored
Fix Android build on CI
Use official Github Actions docker image to consume Android NDK only.
1 parent d5fc49b commit 821c7d8

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

.github/workflows/android.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,24 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
image:
19-
- r22
2018
platform:
19+
- android-26
2120
- android-27
22-
- android-29
2321
abi:
2422
- armeabi-v7a
2523
- arm64-v8a
2624
build_type: [Debug, Release]
2725

2826
runs-on: ubuntu-latest
2927

30-
container:
31-
image: bojoe/cpp-android-ndk-build-env-ubuntu:${{ matrix.image }}
32-
options: --user root
33-
3428
steps:
35-
- uses: actions/checkout@v3
29+
- name: Install Ninja
30+
run: sudo apt-get install ninja-build
31+
32+
- uses: actions/checkout@v4
3633
with:
3734
submodules: recursive
3835

39-
- run: cmake -H$GITHUB_WORKSPACE -B/home/developer/build -GNinja -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_HOME/build/cmake/android.toolchain.cmake -DANDROID_ABI=${{ matrix.abi }} -DANDROID_PLATFORM=${{ matrix.platform }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
36+
- run: cmake -H$GITHUB_WORKSPACE -B$GITHUB_WORKSPACE/build -GNinja -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_HOME/build/cmake/android.toolchain.cmake -DANDROID_ABI=${{ matrix.abi }} -DANDROID_PLATFORM=${{ matrix.platform }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
4037

41-
- run: cmake --build /home/developer/build
38+
- run: cmake --build $GITHUB_WORKSPACE/build

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.8...3.19)
1+
cmake_minimum_required(VERSION 3.8)
22

33
project(taocpp-json VERSION 1.0.0 LANGUAGES CXX)
44

0 commit comments

Comments
 (0)