From 89e020c94285f9ebc04098f0b418d7b18ca3195e Mon Sep 17 00:00:00 2001
From: Bart Louwers <bart@emeel.net>
Date: Mon, 4 Sep 2023 20:13:25 +0200
Subject: [PATCH] Deduplicate job names CI, remove path filtering (#1598)

---
 .github/workflows/android-ci.yml | 26 +++++---------------------
 .github/workflows/ios-ci.yml     | 25 ++-----------------------
 .github/workflows/linux-ci.yml   | 31 ++++++++-----------------------
 3 files changed, 15 insertions(+), 67 deletions(-)

diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml
index 986ea4bd9..d9f87d95b 100644
--- a/.github/workflows/android-ci.yml
+++ b/.github/workflows/android-ci.yml
@@ -24,25 +24,10 @@ on:
       - "vendor/**"
       - ".gitmodules"
       - "!**/*.md"
+
   pull_request:
     branches:
       - '*'
-    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
@@ -50,7 +35,7 @@ concurrency:
   cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:
-  build:
+  android-build:
     runs-on: ubuntu-22.04
     defaults:
       run:
@@ -61,7 +46,6 @@ jobs:
       IS_LOCAL_DEVELOPMENT: false
       MLN_ANDROID_STL: c++_static
     steps:
-
       - uses: actions/checkout@v3
         with:
           submodules: recursive
@@ -117,7 +101,7 @@ jobs:
         env:
           cache-name: gradle-v1
         with:
-          path: ~/.gradle'
+          path: ~/.gradle
           key: ${{ env.cache-name }}-{{ hashFiles 'gradle/dependencies.gradle' }}-{{ hashFiles 'build.gradle' }}-{{ hashFiles 'gradle/wrapper/gradle-wrapper.properties' }}'
           restore-keys: |
             - ${{ env.cache-name }}
@@ -222,8 +206,8 @@ jobs:
             MapboxGLAndroidSDKTestApp/lint-baseline.xml
             MapboxGLAndroidSDK/build/intermediates/cmake/debug/obj
 
-  instrumentation-test:
-    needs: build
+  android-instrumentation-test:
+    needs: android-build
 
     runs-on: ubuntu-latest
     if: github.repository_owner == 'maplibre' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/android-annotations')
diff --git a/.github/workflows/ios-ci.yml b/.github/workflows/ios-ci.yml
index 5eec81f15..4ff772d1a 100644
--- a/.github/workflows/ios-ci.yml
+++ b/.github/workflows/ios-ci.yml
@@ -33,30 +33,9 @@ on:
   pull_request:
     branches:
       - '*'
-    paths:
-      - CMakeLists.txt
-      - 'platform/ios/**'
-      - 'platform/darwin/**'
-      - ".github/workflows/ios-ci.yml"
-      - "bin/**"
-      - "expression-test/**"
-      - "include/**"
-      - "metrics/**"
-      - "platform/default/**"
-      - "render-test/**"
-      - "scripts/**"
-      - "src/**"
-      - "test/**"
-      - "vendor/**"
-      - ".gitmodules"
-      - "!**/*.md"
-      - WORKSPACE
-      - BUILD.bazel
-      - .bazelrc
-      - .bazelversion
 
 jobs:
-  build:
+  ios-build:
     strategy:
       fail-fast: false
       matrix:
@@ -64,7 +43,7 @@ jobs:
     runs-on: [self-hosted, macOS, ARM64]
     concurrency:
       # cancel jobs on PRs only
-      group: ${{ github.workflow }}-${{ github.ref }}
+      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.renderer }}
       cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
     env:
       BUILDTYPE: Debug
diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml
index 94679bea8..f13f91f07 100644
--- a/.github/workflows/linux-ci.yml
+++ b/.github/workflows/linux-ci.yml
@@ -5,7 +5,6 @@ on:
   push:
     branches:
       - main
-      - topic/drawable
     paths:
       - "src/**"
       - "test/**"
@@ -24,20 +23,6 @@ on:
   pull_request:
     branches:
       - '*'
-    paths:
-      - "src/**"
-      - "test/**"
-      - "render-test/**"
-      - "expression-test/**"
-      - "include/**"
-      - ".github/workflows/linux-ci.yml"
-      - "vendor/**"
-      - "CMakeLists.txt"
-      - metrics/linux-gcc8-release-style.json
-      - WORKSPACE
-      - BUILD.bazel
-      - .bazelrc
-      - .bazelversion
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -45,7 +30,7 @@ concurrency:
   cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:
-  build:
+  linux-build:
     strategy:
       fail-fast: false
       matrix:
@@ -121,8 +106,8 @@ jobs:
           path: build/expression-test/mbgl-expression-test
           retention-days: 1
 
-  test:
-    needs: build
+  linux-test:
+    needs: linux-build
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
@@ -148,8 +133,8 @@ jobs:
       - name: Run C++ tests
         run: xvfb-run -a ./mbgl-test-runner
 
-  expression-test:
-    needs: build
+  linux-expression-test:
+    needs: linux-build
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
@@ -163,8 +148,8 @@ jobs:
       - name: Run expression test
         run: ./mbgl-expression-test
 
-  render-test:
-    needs: build
+  linux-render-test:
+    needs: linux-build
     runs-on: ubuntu-22.04
     steps:
       - name: Install dependencies
@@ -194,7 +179,7 @@ jobs:
           path: |
             metrics/linux-gcc8-release-style.html
 
-  coverage:
+  linux-coverage:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3