From 395d9e5f1e6070a55cd60b984069e83e914a367e Mon Sep 17 00:00:00 2001
From: Bart Louwers <bart@emeel.net>
Date: Wed, 31 May 2023 12:02:44 +0200
Subject: [PATCH] Consolidate android-ci-pull.yml and android-ci.yml (#1190)

---
 .github/workflows/android-ci-pull.yml | 126 --------------------------
 .github/workflows/android-ci.yml      |  27 ++++++
 2 files changed, 27 insertions(+), 126 deletions(-)
 delete mode 100644 .github/workflows/android-ci-pull.yml

diff --git a/.github/workflows/android-ci-pull.yml b/.github/workflows/android-ci-pull.yml
deleted file mode 100644
index f2c9d960a..000000000
--- a/.github/workflows/android-ci-pull.yml
+++ /dev/null
@@ -1,126 +0,0 @@
-name: android-ci-pull
-
-on:
-  workflow_dispatch:
-  pull_request:
-    branches:
-      - main
-    paths:
-      - CMakeLists.txt
-      - 'platform/android/**'
-      - ".github/workflows/android-ci.yml"
-      - "bin/**"
-      - "expression-test/**"
-      - "include/**"
-      - "metrics/**"
-      - "platform/default/**"
-      - "render-test/**"
-      - "scripts/**"
-      - "src/**"
-      - "test/**"
-      - "vendor/**"
-      - ".gitmodules"
-      - "!**/*.md"
-
-concurrency:
-  # cancel jobs on PRs only
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
-
-jobs:
-  build:
-    runs-on: ubuntu-22.04
-    defaults:
-      run:
-        working-directory: platform/android
-    env:
-      JOBS: 8
-      BUILDTYPE: Debug
-      IS_LOCAL_DEVELOPMENT: false
-      MLN_ANDROID_STL: c++_static
-    steps:
-
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-          fetch-depth: 0
-
-      - name: Cache node modules
-        uses: actions/cache@v3
-        env:
-          cache-name: cache-node-modules
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-
-      - name: npm install
-        run: npm install --ignore-scripts
-        working-directory: platform/android
-
-      - name: Install ccache
-        run: sudo apt-get install -y ccache
-
-      - name: Prepare ccache
-        run: ccache --clear
-
-      - name: Cache ccache
-        uses: actions/cache@v3
-        env:
-          cache-name: ccache-v1
-        with:
-          path: ~/.ccache'
-          key: ${{ env.cache-name }}-${{ runner.os }}-${{ github.job }}-${{ github.ref }}-${{ github.sha }}-${{ github.head_ref }}
-          restore-keys: |
-            ${{ env.cache-name }}-${{ runner.os }}-${{ github.job }}-${{ github.ref }}-${{ github.sha }}
-            ${{ env.cache-name }}-${{ runner.os }}-${{ github.job }}-${{ github.ref }}
-            ${{ env.cache-name }}-${{ runner.os }}-${{ github.job }}
-
-      - name: Clear ccache statistics
-        run: |
-          ccache --zero-stats
-          ccache --max-size=2G
-          ccache --show-stats
-
-      - name: restore-gradle-cache
-        uses: actions/cache@v3
-        env:
-          cache-name: gradle-v1
-        with:
-          path: ~/.gradle'
-          key: ${{ env.cache-name }}-{{ hashFiles 'gradle/dependencies.gradle' }}-{{ hashFiles 'build.gradle' }}-{{ hashFiles 'gradle/wrapper/gradle-wrapper.properties' }}'
-          restore-keys: |
-            - ${{ env.cache-name }}
-
-      - name: Check code style
-        run: make android-check
-
-      - name: Run Android unit tests
-        run: make run-android-unit-test
-    
-      - name: Get latest CMake and Ninja
-        uses: lukka/get-cmake@latest
-        with:
-          cmakeVersion: 3.10.2
-          ninjaVersion: latest
-      
-      - name: Build libmapbox-gl.so for arm-v8
-        run: |
-          cmake --version
-          make android-lib-arm-v8
-
-      - name: Store debug artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: debug-artifacts
-          path: |
-            MapboxGLAndroidSDKTestApp/build/outputs/apk/debug
-            MapboxGLAndroidSDK/build/reports/lint-results.html
-            MapboxGLAndroidSDK/lint-baseline.xml
-            MapboxGLAndroidSDKTestApp/build/reports/lint-results.html
-            MapboxGLAndroidSDKTestApp/build/reports/lint-results.xml
-            MapboxGLAndroidSDKTestApp/lint-baseline.xml
-            MapboxGLAndroidSDK/build/intermediates/cmake/debug/obj
diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml
index 8d350a1aa..1f870da5e 100644
--- a/.github/workflows/android-ci.yml
+++ b/.github/workflows/android-ci.yml
@@ -23,6 +23,30 @@ on:
       - "vendor/**"
       - ".gitmodules"
       - "!**/*.md"
+  pull_request:
+    branches:
+      - main
+    paths:
+      - CMakeLists.txt
+      - 'platform/android/**'
+      - ".github/workflows/android-ci.yml"
+      - "bin/**"
+      - "expression-test/**"
+      - "include/**"
+      - "metrics/**"
+      - "platform/default/**"
+      - "render-test/**"
+      - "scripts/**"
+      - "src/**"
+      - "test/**"
+      - "vendor/**"
+      - ".gitmodules"
+      - "!**/*.md"
+
+concurrency:
+  # cancel jobs on PRs only
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:
   build:
@@ -56,6 +80,7 @@ jobs:
 
       - name: npm install
         run: npm install --ignore-scripts
+        working-directory: platform/android
 
       - name: Install ccache
         run: sudo apt-get install -y ccache
@@ -101,6 +126,7 @@ jobs:
         run: make android-lib-arm-v8
 
       - name: Copy developer config with API key for UI tests
+        if: github.ref == 'refs/heads/main'
         run: |
           MAPLIBRE_DEVELOPER_CONFIG_XML='${{ secrets.MAPLIBRE_DEVELOPER_CONFIG_XML }}'
           if [ -n "${MAPLIBRE_DEVELOPER_CONFIG_XML}" ]; then
@@ -110,6 +136,7 @@ jobs:
           fi
     
       - name: Build UI tests
+        if: github.ref == 'refs/heads/main'
         run: make android-ui-test-arm-v8
 
       - name: Configure AWS Credentials