diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 891d1326..be973fe0 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -15,11 +15,9 @@ jobs: strategy: fail-fast: false matrix: - image: - - r22 platform: + - android-26 - android-27 - - android-29 abi: - armeabi-v7a - arm64-v8a @@ -27,15 +25,14 @@ jobs: runs-on: ubuntu-latest - container: - image: bojoe/cpp-android-ndk-build-env-ubuntu:${{ matrix.image }} - options: --user root - steps: - - uses: actions/checkout@v3 + - name: Install Ninja + run: sudo apt-get install ninja-build + + - uses: actions/checkout@v4 with: submodules: recursive - - 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 }} + - 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 }} - - run: cmake --build /home/developer/build + - run: cmake --build $GITHUB_WORKSPACE/build diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a753591..22ff23e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.8...3.19) +cmake_minimum_required(VERSION 3.8) project(taocpp-json VERSION 1.0.0 LANGUAGES CXX)