Skip to content

Commit cce88b1

Browse files
clangenbclangenb
authored
Merge pull request #1639 from encointer/cl/merge-v1.12.1-into-fdroid
Merge v1.12.1 into fdroid
2 parents 7f5b280 + 0772e1a commit cce88b1

File tree

12 files changed

+89
-156
lines changed

12 files changed

+89
-156
lines changed

‎.github/workflows/android_build.yml

+9-14
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,24 @@ on:
66
pull_request:
77
branches: [master, f-droid]
88

9-
env:
10-
JAVA_VERSION: 12.x
9+
# Cancel a currently running workflow from the same PR, branch or tag when a new workflow is
10+
# triggered (ref https://stackoverflow.com/a/72408109)
11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
13+
cancel-in-progress: true
1114

1215
jobs:
13-
cancel_previous_runs:
14-
name: Cancel Previous Runs
15-
runs-on: ubuntu-20.04
16-
steps:
17-
- uses: styfle/cancel-workflow-action@0.11.0
18-
with:
19-
access_token: ${{ secrets.GITHUB_TOKEN }}
20-
2116
build-android:
2217
runs-on: ubuntu-latest
2318
timeout-minutes: 60
2419
steps:
2520
# Setup Environment
26-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
2722

28-
- uses: actions/setup-java@v3
23+
- uses: actions/setup-java@v4
2924
with:
30-
java-version: ${{ env.JAVA_VERSION }}
31-
distribution: "zulu"
25+
java-version: "17"
26+
distribution: "temurin"
3227

3328
- name: Install flutter wrapper
3429
run: ./scripts/install_flutter_wrapper.sh

‎.github/workflows/android_integration_test.yml

+14-17
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,15 @@ on:
77
branches: [master, f-droid]
88

99
env:
10-
JAVA_VERSION: 12.x
1110
ARTIFACT_PATH: ./screenshots
1211

13-
jobs:
14-
cancel_previous_runs:
15-
name: Cancel Previous Runs
16-
runs-on: ubuntu-20.04
17-
steps:
18-
- uses: styfle/cancel-workflow-action@0.11.0
19-
with:
20-
access_token: ${{ secrets.GITHUB_TOKEN }}
12+
# Cancel a currently running workflow from the same PR, branch or tag when a new workflow is
13+
# triggered (ref https://stackoverflow.com/a/72408109)
14+
concurrency:
15+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
16+
cancel-in-progress: true
2117

18+
jobs:
2219
android-device-tests:
2320
# use macos to have hardware acceleration https://github.com/ReactiveCircus/android-emulator-runner/issues/46
2421
runs-on: ${{ matrix.os }}
@@ -37,18 +34,18 @@ jobs:
3734
fail-fast: false
3835
steps:
3936
# Setup Environment
40-
- uses: actions/checkout@v3
37+
- uses: actions/checkout@v4
4138

42-
- uses: actions/setup-java@v3
39+
- uses: actions/setup-java@v4
4340
with:
44-
java-version: ${{ env.JAVA_VERSION }}
45-
distribution: "zulu"
41+
java-version: "17"
42+
distribution: "temurin"
4643

4744
- name: Install flutter wrapper
4845
run: ./scripts/install_flutter_wrapper.sh
4946

5047
- name: Setup Android SDK and accept licences
51-
uses: android-actions/setup-android@v2
48+
uses: android-actions/setup-android@v3
5249

5350
- name: List android images
5451
run: sdkmanager --list | grep system-images
@@ -60,15 +57,15 @@ jobs:
6057
run: .flutter/bin/dart run melos bootstrap
6158

6259
- name: Gradle cache
63-
uses: actions/cache@v3
60+
uses: actions/cache@v4
6461
with:
6562
path: |
6663
~/.gradle/caches
6764
~/.gradle/wrapper
6865
key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}-${{ hashFiles('**/buildSrc/**/*.kt') }}
6966

7067
- name: AVD cache
71-
uses: actions/cache@v3
68+
uses: actions/cache@v4
7269
id: avd-cache
7370
with:
7471
path: |
@@ -117,7 +114,7 @@ jobs:
117114

118115
- name: "Upload screenshots"
119116
if: always()
120-
uses: actions/upload-artifact@v3
117+
uses: actions/upload-artifact@v4
121118
with:
122119
name: ${{ matrix.device }}
123120
path: ${{ env.ARTIFACT_PATH }}

‎.github/workflows/fdroid.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,19 @@ on:
66
pull_request:
77
branches: [master, f-droid]
88

9+
# Cancel a currently running workflow from the same PR, branch or tag when a new workflow is
10+
# triggered (ref https://stackoverflow.com/a/72408109)
11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
13+
cancel-in-progress: true
14+
915
jobs:
1016
setup-works:
1117
runs-on: ubuntu-latest
1218
timeout-minutes: 30
1319
steps:
1420
# Setup Environment
15-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
1622

1723
- name: Check fdroid setup
1824
run: ./scripts/fdroid_init.sh

‎.github/workflows/ios_integration_test.yml

+11-14
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,15 @@ on:
99
branches: [master, f-droid]
1010

1111
env:
12-
JAVA_VERSION: 12.x
1312
ARTIFACT_PATH: ./screenshots
1413

15-
jobs:
16-
cancel_previous_runs:
17-
name: Cancel Previous Runs
18-
runs-on: ubuntu-20.04
19-
steps:
20-
- uses: styfle/cancel-workflow-action@0.11.0
21-
with:
22-
access_token: ${{ secrets.GITHUB_TOKEN }}
14+
# Cancel a currently running workflow from the same PR, branch or tag when a new workflow is
15+
# triggered (ref https://stackoverflow.com/a/72408109)
16+
concurrency:
17+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
18+
cancel-in-progress: true
2319

20+
jobs:
2421
ios_device_test:
2522
runs-on: macos-13
2623
timeout-minutes: 60
@@ -45,7 +42,7 @@ jobs:
4542
fail-fast: false
4643
steps:
4744
# Setup Environment
48-
- uses: actions/checkout@v3
45+
- uses: actions/checkout@v4
4946

5047
- name: prepare xcode
5148
uses: maxim-lobanov/setup-xcode@v1
@@ -56,10 +53,10 @@ jobs:
5653
working-directory: ./scripts
5754
run: ./ios_init_env.sh
5855

59-
- uses: actions/setup-java@v3
56+
- uses: actions/setup-java@v4
6057
with:
61-
java-version: ${{ env.JAVA_VERSION }}
62-
distribution: "zulu"
58+
java-version: "17"
59+
distribution: "temurin"
6360

6461
- name: Install flutter wrapper
6562
run: ./scripts/install_flutter_wrapper.sh
@@ -120,7 +117,7 @@ jobs:
120117

121118
- name: "Upload screenshots and recording"
122119
if: always()
123-
uses: actions/upload-artifact@v3
120+
uses: actions/upload-artifact@v4
124121
with:
125122
name: ${{ matrix.device }}
126123
path: ${{ env.ARTIFACT_PATH }}

‎.github/workflows/unit_tests.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,19 @@ on:
66
pull_request:
77
branches: [master, f-droid]
88

9+
# Cancel a currently running workflow from the same PR, branch or tag when a new workflow is
10+
# triggered (ref https://stackoverflow.com/a/72408109)
11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
13+
cancel-in-progress: true
14+
915
jobs:
1016
flutter:
1117
runs-on: ubuntu-latest
1218
timeout-minutes: 30
1319
steps:
1420
# Setup Environment
15-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
1622

1723
- name: Install flutter wrapper
1824
run: ./scripts/install_flutter_wrapper.sh

0 commit comments

Comments
 (0)