Skip to content

Commit

Permalink
Use exact version of NDK needed by presubmit in Github Actions
Browse files Browse the repository at this point in the history
It is required to install ninja manually due to it not being included in
the virtual env provided by Github Actions runner.

See actions/runner-images#741

Fixes: 216535050
Test: Github CI
Change-Id: I1a741b1765822f0004adc3985b7babc8022046a5
  • Loading branch information
dlam committed Jan 27, 2022
1 parent ab4b011 commit 8d79f10
Showing 1 changed file with 20 additions and 1 deletion.
21 changes: 20 additions & 1 deletion .github/workflows/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -164,12 +164,31 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: "11"
# Required for CMake when building workmanager.
- name: "Install Ninja"
run: |
set -x
if [ "$RUNNER_OS" == "Linux" ]; then
sudo apt-get install ninja-build
elif [ "$RUNNER_OS" == "macOS" ]; then
brew install ninja
elif [ "$RUNNER_OS" == "Windows" ]; then
choco install ninja
else
echo "Failed to install ninja due to unsupport OS: $RUNNER_OS"
exit 1
fi
cmake --version
which cmake
- name: "Set environment variables"
shell: bash
run: |
set -x
echo "DIST_DIR=$HOME/dist" >> $GITHUB_ENV
# Make ninja visible to CMAKE
echo "CMAKE_MAKE_PROGRAM=$(which ninja)" >> $GITHUB_ENV
echo "ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/23.1.7779620" >> $GITHUB_ENV
# gradle action loads the dependencies cache only on the first run based on arguments.
# to control it, we explicitly invoke it once which makes it load the dependencies cache with the parameters
# we control
Expand Down Expand Up @@ -218,7 +237,7 @@ jobs:
JAVA_HOME: ${{ steps.setup-java.outputs.path }}
JAVA_TOOLS_JAR: ${{ steps.setup-tools-jar.outputs.toolsJar }}
with:
arguments: buildOnServer zipTestConfigsWithApks test ${{ needs.setup.outputs.gradlew_flags }}
arguments: buildOnServer zipTestConfigsWithApks test ${{ needs.setup.outputs.gradlew_flags }} -DCMAKE_MAKE_PROGRAM=/usr/bin/ninja
build-root-directory: ${{ env.project-root }}
configuration-cache-enabled: false
dependencies-cache-enabled: false
Expand Down

0 comments on commit 8d79f10

Please sign in to comment.