Merge pull request #1639 from encointer/cl/merge-v1.12.1-into-fdroid

Merge v1.12.1 into fdroid
encointer · Feb 3, 2024 · cce88b1 · cce88b1
2 parents 7f5b280 + 0772e1a
commit cce88b1
Show file tree

Hide file tree

Showing 12 changed files with 89 additions and 156 deletions.
diff --git a/.github/workflows/android_build.yml b/.github/workflows/android_build.yml
@@ -6,29 +6,24 @@ on:
   pull_request:
     branches: [master, f-droid]
 
-env:
-  JAVA_VERSION: 12.x
+# Cancel a currently running workflow from the same PR, branch or tag when a new workflow is
+# triggered (ref https://stackoverflow.com/a/72408109)
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 jobs:
-  cancel_previous_runs:
-    name: Cancel Previous Runs
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: styfle/cancel-workflow-action@0.11.0
-        with:
-          access_token: ${{ secrets.GITHUB_TOKEN }}
-
   build-android:
     runs-on: ubuntu-latest
     timeout-minutes: 60
     steps:
       # Setup Environment
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
-          java-version: ${{ env.JAVA_VERSION }}
-          distribution: "zulu"
+          java-version: "17"
+          distribution: "temurin"
 
       - name: Install flutter wrapper
         run: ./scripts/install_flutter_wrapper.sh

diff --git a/.github/workflows/android_integration_test.yml b/.github/workflows/android_integration_test.yml
@@ -7,18 +7,15 @@ on:
     branches: [master, f-droid]
 
 env:
-  JAVA_VERSION: 12.x
   ARTIFACT_PATH: ./screenshots
 
-jobs:
-  cancel_previous_runs:
-    name: Cancel Previous Runs
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: styfle/cancel-workflow-action@0.11.0
-        with:
-          access_token: ${{ secrets.GITHUB_TOKEN }}
+# Cancel a currently running workflow from the same PR, branch or tag when a new workflow is
+# triggered (ref https://stackoverflow.com/a/72408109)
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
+jobs:
   android-device-tests:
     # use macos to have hardware acceleration https://github.com/ReactiveCircus/android-emulator-runner/issues/46
     runs-on: ${{ matrix.os }}
@@ -37,18 +34,18 @@ jobs:
       fail-fast: false
     steps:
       # Setup Environment
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
-          java-version: ${{ env.JAVA_VERSION }}
-          distribution: "zulu"
+          java-version: "17"
+          distribution: "temurin"
 
       - name: Install flutter wrapper
         run: ./scripts/install_flutter_wrapper.sh
 
       - name: Setup Android SDK and accept licences
-        uses: android-actions/setup-android@v2
+        uses: android-actions/setup-android@v3
 
       - name: List android images
         run: sdkmanager --list | grep system-images
@@ -60,15 +57,15 @@ jobs:
         run: .flutter/bin/dart run melos bootstrap
 
       - name: Gradle cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches
             ~/.gradle/wrapper
           key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}-${{ hashFiles('**/buildSrc/**/*.kt') }}
 
       - name: AVD cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: avd-cache
         with:
           path: |
@@ -117,7 +114,7 @@ jobs:
 
       - name: "Upload screenshots"
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.device }}
           path: ${{ env.ARTIFACT_PATH }}
diff --git a/.github/workflows/fdroid.yml b/.github/workflows/fdroid.yml
@@ -6,13 +6,19 @@ on:
   pull_request:
     branches: [master, f-droid]
 
+# Cancel a currently running workflow from the same PR, branch or tag when a new workflow is
+# triggered (ref https://stackoverflow.com/a/72408109)
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   setup-works:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
       # Setup Environment
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Check fdroid setup
         run: ./scripts/fdroid_init.sh

diff --git a/.github/workflows/ios_integration_test.yml b/.github/workflows/ios_integration_test.yml
@@ -9,18 +9,15 @@ on:
     branches: [master, f-droid]
 
 env:
-  JAVA_VERSION: 12.x
   ARTIFACT_PATH: ./screenshots
 
-jobs:
-  cancel_previous_runs:
-    name: Cancel Previous Runs
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: styfle/cancel-workflow-action@0.11.0
-        with:
-          access_token: ${{ secrets.GITHUB_TOKEN }}
+# Cancel a currently running workflow from the same PR, branch or tag when a new workflow is
+# triggered (ref https://stackoverflow.com/a/72408109)
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
+jobs:
   ios_device_test:
     runs-on: macos-13
     timeout-minutes: 60
@@ -45,7 +42,7 @@ jobs:
       fail-fast: false
     steps:
       # Setup Environment
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: prepare xcode
         uses: maxim-lobanov/setup-xcode@v1
@@ -56,10 +53,10 @@ jobs:
         working-directory: ./scripts
         run: ./ios_init_env.sh
 
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
-          java-version: ${{ env.JAVA_VERSION }}
-          distribution: "zulu"
+          java-version: "17"
+          distribution: "temurin"
 
       - name: Install flutter wrapper
         run: ./scripts/install_flutter_wrapper.sh
@@ -120,7 +117,7 @@ jobs:
 
       - name: "Upload screenshots and recording"
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.device }}
           path: ${{ env.ARTIFACT_PATH }}
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
@@ -6,13 +6,19 @@ on:
   pull_request:
     branches: [master, f-droid]
 
+# Cancel a currently running workflow from the same PR, branch or tag when a new workflow is
+# triggered (ref https://stackoverflow.com/a/72408109)
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   flutter:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
       # Setup Environment
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install flutter wrapper
         run: ./scripts/install_flutter_wrapper.sh