fixup! Improve build configurations

Igalia · Jan 13, 2025 · bd1c69f · bd1c69f
1 parent 4d0b127
commit bd1c69f
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 13 deletions.
diff --git a/.github/workflows/build-latest-preview.yml b/.github/workflows/build-latest-preview.yml
@@ -23,7 +23,7 @@ jobs:
 
   upload-preview:
     needs: build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   build-code:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -3,7 +3,7 @@ on: workflow_call
 
 jobs:
   check-format:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -21,7 +21,7 @@ jobs:
         run: ./gradlew checkFormat
 
   check-jni:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   lint-checks:
-      runs-on: ubuntu-latest
+      runs-on: ubuntu-24.04
       steps:
         - name: Checkout
           uses: actions/checkout@v4

diff --git a/.github/workflows/publish-github-release.yml b/.github/workflows/publish-github-release.yml
@@ -16,7 +16,7 @@ jobs:
       build_type: Debug
   upload:
     needs: build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/.github/workflows/publish-to-maven-central.yml b/.github/workflows/publish-to-maven-central.yml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   publish:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout

diff --git a/.github/workflows/run-webdriver-tests.yml b/.github/workflows/run-webdriver-tests.yml
@@ -9,12 +9,12 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         api-level: [35]
         arch: [x86_64]
-    if: ${{ github.event.workflow_run.conclusion == "success" }}
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     steps:
       - name: checkout
         uses: actions/checkout@v4
@@ -35,11 +35,12 @@ jobs:
           key: avd-${{ matrix.api-level }}
 
       - name: Create AVD and generate snapshot for caching
-        if: steps.avd-cache.outputs.cache-hit != "true"
+        if: steps.avd-cache.outputs.cache-hit != 'true'
         uses: reactivecircus/android-emulator-runner@v2
         with:
           api-level: ${{ matrix.api-level }}
           arch: ${{ matrix.arch }}
+          cmake: 3.31.1
           force-avd-creation: false
           emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: false
@@ -57,6 +58,7 @@ jobs:
         with:
           api-level: ${{ matrix.api-level }}
           arch: ${{ matrix.arch }}
+          cmake: 3.31.1
           force-avd-creation: false
           emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -3,7 +3,7 @@ on: workflow_call
 
 jobs:
   instrumentation-tests:
-      runs-on: ubuntu-latest
+      runs-on: ubuntu-24.04
       steps:
         - name: Checkout
           uses: actions/checkout@v4
@@ -27,10 +27,11 @@ jobs:
           uses: reactivecircus/android-emulator-runner@v2
           with:
             api-level: 35
-            cmake: 3.31.1
             arch: x86_64
+            cmake: 3.31.1
             target: google_apis
-            force-avd-creation: false
+            force-avd-creation: true
+            emulator-port: 5556
             emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
             disable-animations: true
             pre-emulator-launch-script: ./gradlew wpe:build