diff --git a/.ci_tools/setup_env.sh b/.ci_tools/setup_env.sh deleted file mode 100755 index 3322bae7b..000000000 --- a/.ci_tools/setup_env.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -# Installs Android SDK, NDK, and CMake required to build the samples. - -if [ -f ~/.android/repositories.cfg ]; then - touch ~/.android/repositories.cfg -fi - -for version in $(find . -name build.gradle | xargs grep -h compileSdk | sort | uniq | grep -o '[0-9]\+ *$'); do - echo y | sdkmanager "platforms;android-${version}" -done - -for version in $(find . -name build.gradle | xargs grep -h ndkVersion | sort | uniq | cut -d \' -f 2); do - echo y | sdkmanager "ndk;${version}" -done - -echo y | sdkmanager "cmake;3.18.1" -echo y | sdkmanager "cmake;3.22.1" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4c590aa25..13250d94b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,11 +24,7 @@ jobs: - uses: actions/setup-python@v4 with: python-version: 3.x - - name: setup env - run: - source .ci_tools/setup_env.sh - # Needs to be after "setup env" because we use the clang-format shipped with the NDK. - - uses: pre-commit/action@v3.0.0 + - name: build samples run: | export SAMPLE_CI_RESULT=0 @@ -36,3 +32,6 @@ jobs: source .ci_tools/run_samples.sh eval "[[ $SAMPLE_CI_RESULT == 0 ]]" + # Needs to be run last because we use the clang-format shipped with the NDK. + - uses: pre-commit/action@v3.0.0 +