From 0e77d3d82d3e8d7871a169d5f5352fd493f1e132 Mon Sep 17 00:00:00 2001 From: Yifan Yang Date: Tue, 29 Nov 2022 13:49:38 -0800 Subject: [PATCH] Remove custom NDK installations --- .github/workflows/api-information.yml | 9 --------- .github/workflows/build-src-check.yml | 7 ------- .github/workflows/ci_tests.yml | 27 --------------------------- .github/workflows/fireperf-e2e.yml | 9 --------- .github/workflows/health-metrics.yml | 18 ------------------ .github/workflows/make-bom.yml | 6 ------ .github/workflows/smoke-tests.yml | 9 --------- 7 files changed, 85 deletions(-) diff --git a/.github/workflows/api-information.yml b/.github/workflows/api-information.yml index b09ed2f3741..67e624524a7 100644 --- a/.github/workflows/api-information.yml +++ b/.github/workflows/api-information.yml @@ -17,15 +17,6 @@ jobs: java-version: 11 distribution: temurin cache: gradle - - name: Set up NDK 21.4.7075529 - run: | - ANDROID_ROOT=/usr/local/lib/android - ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk - ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk-bundle - SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager - echo "y" | $SDKMANAGER "ndk;21.4.7075529" - ln -sfn ${ANDROID_SDK_ROOT}/ndk/21.4.7075529 ${ANDROID_NDK_ROOT} - echo "ANDROID_NDK_HOME=${ANDROID_NDK_ROOT}" >> $GITHUB_ENV - name: Set up Python 3.10 uses: actions/setup-python@v4 with: diff --git a/.github/workflows/build-src-check.yml b/.github/workflows/build-src-check.yml index b5267d02bc1..38ff1f10492 100644 --- a/.github/workflows/build-src-check.yml +++ b/.github/workflows/build-src-check.yml @@ -14,13 +14,6 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3.0.2 - - name: Setup NDK - run: | - ANDROID_ROOT=/usr/local/lib/android - ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk - ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk-bundle - ln -sfn $ANDROID_SDK_ROOT/ndk/21.4.7075529 $ANDROID_NDK_ROOT - - name: Set up JDK 11 uses: actions/setup-java@v2 with: diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index e9caa0de682..c2756d17dcd 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -22,15 +22,6 @@ jobs: with: fetch-depth: 2 submodules: true - - name: Set up NDK 21.4.7075529 - run: | - ANDROID_ROOT=/usr/local/lib/android - ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk - ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk-bundle - SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager - echo "y" | $SDKMANAGER "ndk;21.4.7075529" - ln -sfn ${ANDROID_SDK_ROOT}/ndk/21.4.7075529 ${ANDROID_NDK_ROOT} - echo "ANDROID_NDK_HOME=${ANDROID_NDK_ROOT}" >> $GITHUB_ENV - name: Set up JDK 11 uses: actions/setup-java@v2 @@ -59,15 +50,6 @@ jobs: with: fetch-depth: 2 submodules: true - - name: Set up NDK 21.4.7075529 - run: | - ANDROID_ROOT=/usr/local/lib/android - ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk - ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk-bundle - SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager - echo "y" | $SDKMANAGER "ndk;21.4.7075529" - ln -sfn ${ANDROID_SDK_ROOT}/ndk/21.4.7075529 ${ANDROID_NDK_ROOT} - echo "ANDROID_NDK_HOME=${ANDROID_NDK_ROOT}" >> $GITHUB_ENV - name: Set up JDK 11 uses: actions/setup-java@v2 @@ -118,15 +100,6 @@ jobs: with: fetch-depth: 2 submodules: true - - name: Set up NDK 21.4.7075529 - run: | - ANDROID_ROOT=/usr/local/lib/android - ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk - ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk-bundle - SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager - echo "y" | $SDKMANAGER "ndk;21.4.7075529" - ln -sfn ${ANDROID_SDK_ROOT}/ndk/21.4.7075529 ${ANDROID_NDK_ROOT} - echo "ANDROID_NDK_HOME=${ANDROID_NDK_ROOT}" >> $GITHUB_ENV - name: Set up JDK 11 uses: actions/setup-java@v2 diff --git a/.github/workflows/fireperf-e2e.yml b/.github/workflows/fireperf-e2e.yml index 73f135b5db0..80a6465079f 100644 --- a/.github/workflows/fireperf-e2e.yml +++ b/.github/workflows/fireperf-e2e.yml @@ -33,15 +33,6 @@ jobs: java-version: 11 distribution: temurin cache: gradle - - name: Set up NDK 21.4.7075529 - run: | - ANDROID_ROOT=/usr/local/lib/android - ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk - ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk-bundle - SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager - echo "y" | $SDKMANAGER "ndk;21.4.7075529" - ln -sfn ${ANDROID_SDK_ROOT}/ndk/21.4.7075529 ${ANDROID_NDK_ROOT} - echo "ANDROID_NDK_HOME=${ANDROID_NDK_ROOT}" >> $GITHUB_ENV - name: Set up Python 3.10 uses: actions/setup-python@v4 with: diff --git a/.github/workflows/health-metrics.yml b/.github/workflows/health-metrics.yml index 8984a33cf7c..d15ef850a30 100644 --- a/.github/workflows/health-metrics.yml +++ b/.github/workflows/health-metrics.yml @@ -21,15 +21,6 @@ jobs: java-version: 11 distribution: temurin cache: gradle - - name: Set up NDK 21.4.7075529 - run: | - ANDROID_ROOT=/usr/local/lib/android - ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk - ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk-bundle - SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager - echo "y" | $SDKMANAGER "ndk;21.4.7075529" - ln -sfn ${ANDROID_SDK_ROOT}/ndk/21.4.7075529 ${ANDROID_NDK_ROOT} - echo "ANDROID_NDK_HOME=${ANDROID_NDK_ROOT}" >> $GITHUB_ENV - name: Set up Python 3.10 uses: actions/setup-python@v4 with: @@ -62,15 +53,6 @@ jobs: java-version: 11 distribution: temurin cache: gradle - - name: Set up NDK 21.4.7075529 - run: | - ANDROID_ROOT=/usr/local/lib/android - ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk - ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk-bundle - SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager - echo "y" | $SDKMANAGER "ndk;21.4.7075529" - ln -sfn ${ANDROID_SDK_ROOT}/ndk/21.4.7075529 ${ANDROID_NDK_ROOT} - echo "ANDROID_NDK_HOME=${ANDROID_NDK_ROOT}" >> $GITHUB_ENV - name: Set up Python 3.10 uses: actions/setup-python@v4 with: diff --git a/.github/workflows/make-bom.yml b/.github/workflows/make-bom.yml index 9a3722ad8bf..27e231cb6af 100644 --- a/.github/workflows/make-bom.yml +++ b/.github/workflows/make-bom.yml @@ -12,12 +12,6 @@ jobs: with: python-version: '3.10' - uses: actions/checkout@v3.0.2 - - name: Setup NDK - run: | - ANDROID_ROOT=/usr/local/lib/android - ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk - ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk-bundle - ln -sfn $ANDROID_SDK_ROOT/ndk/21.4.7075529 $ANDROID_NDK_ROOT - name: Set up JDK 11 uses: actions/setup-java@v2 with: diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml index 00513efd629..e6bbf78afe9 100644 --- a/.github/workflows/smoke-tests.yml +++ b/.github/workflows/smoke-tests.yml @@ -17,15 +17,6 @@ jobs: java-version: 11 distribution: temurin cache: gradle - - name: Set up NDK 21.4.7075529 - run: | - ANDROID_ROOT=/usr/local/lib/android - ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk - ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk-bundle - SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager - echo "y" | $SDKMANAGER "ndk;21.4.7075529" - ln -sfn ${ANDROID_SDK_ROOT}/ndk/21.4.7075529 ${ANDROID_NDK_ROOT} - echo "ANDROID_NDK_HOME=${ANDROID_NDK_ROOT}" >> $GITHUB_ENV - uses: google-github-actions/auth@v0 with: credentials_json: ${{ secrets.GCP_SERVICE_ACCOUNT }}