Skip to content

Commit 256bff9

Browse files
authored
Merge pull request #4606 from Bambooin/release/4.0
2 parents 4948daf + 2b7ff5c commit 256bff9

6 files changed

Lines changed: 47 additions & 47 deletions

File tree

.github/workflows/android-build.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ jobs:
1515
name: Check spotless
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v6
1919
- name: Set up JDK 17
20-
uses: actions/setup-java@v4
20+
uses: actions/setup-java@v5
2121
with:
2222
distribution: "temurin"
2323
java-version: 17
2424
- name: Set up NDK
25-
uses: nttld/setup-ndk@afb4c9964b521afb97c864b7d40b11e6911bd410
25+
uses: nttld/setup-ndk@v1
2626
with:
2727
ndk-version: r28c
2828
link-to-sdk: true
@@ -32,7 +32,7 @@ jobs:
3232
with:
3333
toolchain: stable
3434
- name: Cache Rust dependencies
35-
uses: actions/cache@v4
35+
uses: actions/cache@v5
3636
with:
3737
path: |
3838
~/.cargo/bin/
@@ -61,17 +61,17 @@ jobs:
6161
exit 1
6262
fi
6363
- name: Setup Gradle
64-
uses: gradle/actions/setup-gradle@v5
64+
uses: gradle/actions/setup-gradle@v6
6565
- name: Check formatting using spotless
6666
run: ./gradlew spotlessCheck --stacktrace
6767

6868
build:
6969
name: Build debug
7070
runs-on: ubuntu-latest
7171
steps:
72-
- uses: actions/checkout@v4
72+
- uses: actions/checkout@v6
7373
- name: Set up JDK 17
74-
uses: actions/setup-java@v4
74+
uses: actions/setup-java@v5
7575
with:
7676
distribution: "temurin"
7777
java-version: 17
@@ -80,7 +80,7 @@ jobs:
8080
with:
8181
toolchain: stable
8282
- name: Cache Rust dependencies
83-
uses: actions/cache@v4
83+
uses: actions/cache@v5
8484
with:
8585
path: |
8686
~/.cargo/bin/
@@ -109,6 +109,6 @@ jobs:
109109
exit 1
110110
fi
111111
- name: Setup Gradle
112-
uses: gradle/actions/setup-gradle@v5
112+
uses: gradle/actions/setup-gradle@v6
113113
- name: Build with Gradle
114114
run: ./gradlew assembledebug --stacktrace

.github/workflows/android-debug-artifact-ondemand.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ jobs:
1212
if: github.event.comment.body == 'Build test apk' && (github.actor == 'VishalNehra' || github.actor == 'TranceLove' || github.actor == 'EmmanuelMess' || github.actor == 'VishnuSanal')
1313
steps:
1414
- name: Acknowledge the request with thumbs up reaction
15-
uses: peter-evans/create-or-update-comment@v2
15+
uses: peter-evans/create-or-update-comment@v5
1616
with:
1717
comment-id: ${{ github.event.comment.id }}
1818
reactions: '+1'
1919
- name: Github API Request
2020
id: request
21-
uses: octokit/request-action@v2.0.2
21+
uses: octokit/request-action@v3
2222
with:
2323
route: ${{ github.event.issue.pull_request.url }}
2424
env:
@@ -30,18 +30,18 @@ jobs:
3030
echo "::set-output name=repo_clone_url::${{ fromJson(steps.request.outputs.data).head.repo.clone_url }}"
3131
echo "::set-output name=repo_ssh_url::${{ fromJson(steps.request.outputs.data).head.repo.ssh_url }}"
3232
- name: Checkout PR Branch
33-
uses: actions/checkout@v4
33+
uses: actions/checkout@v6
3434
with:
3535
token: ${{ secrets.GITHUB_TOKEN }}
3636
repository: ${{fromJson(steps.request.outputs.data).head.repo.full_name}}
3737
ref: ${{fromJson(steps.request.outputs.data).head.ref}}
3838
- name: Set up JDK 17
39-
uses: actions/setup-java@v4
39+
uses: actions/setup-java@v5
4040
with:
4141
distribution: "temurin"
4242
java-version: 17
4343
- name: Set up NDK
44-
uses: nttld/setup-ndk@afb4c9964b521afb97c864b7d40b11e6911bd410
44+
uses: nttld/setup-ndk@v1
4545
with:
4646
ndk-version: r28c
4747
link-to-sdk: true
@@ -51,7 +51,7 @@ jobs:
5151
with:
5252
toolchain: stable
5353
- name: Cache Rust dependencies
54-
uses: actions/cache@v4
54+
uses: actions/cache@v5
5555
with:
5656
path: |
5757
~/.cargo/bin/
@@ -80,18 +80,18 @@ jobs:
8080
exit 1
8181
fi
8282
- name: Build with Gradle
83-
uses: gradle/actions/setup-gradle@v3
83+
uses: gradle/actions/setup-gradle@v6
8484
with:
8585
arguments: assembleDebug --stacktrace
8686
- name: Upload fdroid artifact
87-
uses: actions/upload-artifact@v4
87+
uses: actions/upload-artifact@v7
8888
id: artifact-upload-fdroid
8989
with:
9090
name: Amaze-Fdroid-debug
9191
path: app/build/outputs/apk/fdroid/debug/app-fdroid-debug.apk
9292
if-no-files-found: error
9393
- name: Upload play artifact
94-
uses: actions/upload-artifact@v4
94+
uses: actions/upload-artifact@v7
9595
id: artifact-upload-play
9696
with:
9797
name: Amaze-Play-debug
@@ -105,7 +105,7 @@ jobs:
105105
echo "PR_Number: $PR_NUMBER"
106106
echo "PR_NUMBER=$PR_NUMBER" >> "$GITHUB_OUTPUT"
107107
- name: Notify the user with a comment once the APK is uploaded
108-
uses: peter-evans/create-or-update-comment@v2
108+
uses: peter-evans/create-or-update-comment@v5
109109
with:
110110
issue-number: ${{ steps.find-pr-id.outputs.PR_NUMBER }}
111111
body: |

.github/workflows/android-debug-artifact-release.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ jobs:
88
apk:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v4
11+
- uses: actions/checkout@v6
1212
- name: Set up JDK 17
13-
uses: actions/setup-java@v4
13+
uses: actions/setup-java@v5
1414
with:
1515
distribution: "temurin"
1616
java-version: 17
1717
- name: Set up NDK
18-
uses: nttld/setup-ndk@afb4c9964b521afb97c864b7d40b11e6911bd410
18+
uses: nttld/setup-ndk@v1
1919
with:
2020
ndk-version: r28c
2121
link-to-sdk: true
@@ -25,7 +25,7 @@ jobs:
2525
with:
2626
toolchain: stable
2727
- name: Cache Rust dependencies
28-
uses: actions/cache@v4
28+
uses: actions/cache@v5
2929
with:
3030
path: |
3131
~/.cargo/bin/
@@ -54,16 +54,16 @@ jobs:
5454
exit 1
5555
fi
5656
- name: Build with Gradle
57-
uses: gradle/actions/setup-gradle@v3
57+
uses: gradle/actions/setup-gradle@v6
5858
with:
5959
arguments: assembleDebug
6060
- name: Upload fdroid artifact
61-
uses: actions/upload-artifact@v4
61+
uses: actions/upload-artifact@v7
6262
with:
6363
name: Amaze-Fdroid-debug
6464
path: app/build/outputs/apk/fdroid/debug/app-fdroid-debug.apk
6565
- name: Upload play artifact
66-
uses: actions/upload-artifact@v4
66+
uses: actions/upload-artifact@v7
6767
with:
6868
name: Amaze-Play-debug
6969
path: app/build/outputs/apk/play/debug/app-play-debug.apk

.github/workflows/android-feature.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@ jobs:
1616
name: Check spotless
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v6
2020
- name: Set up JDK 17
21-
uses: actions/setup-java@v4
21+
uses: actions/setup-java@v5
2222
with:
2323
distribution: "temurin"
2424
java-version: 17
2525
- name: Set up NDK
2626
id: setup-ndk
27-
uses: nttld/setup-ndk@afb4c9964b521afb97c864b7d40b11e6911bd410
27+
uses: nttld/setup-ndk@v1
2828
with:
2929
ndk-version: r28c
3030
link-to-sdk: true
3131
local-cache: true
3232
- name: Setup Gradle
33-
uses: gradle/actions/setup-gradle@v5
33+
uses: gradle/actions/setup-gradle@v6
3434
- name: Check formatting using spotless
3535
env:
3636
ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
@@ -40,9 +40,9 @@ jobs:
4040
name: Build debug and run Jacoco tests
4141
runs-on: ubuntu-latest
4242
steps:
43-
- uses: actions/checkout@v4
43+
- uses: actions/checkout@v6
4444
- name: Set up JDK 17
45-
uses: actions/setup-java@v4
45+
uses: actions/setup-java@v5
4646
with:
4747
distribution: "temurin"
4848
java-version: 17
@@ -51,7 +51,7 @@ jobs:
5151
with:
5252
toolchain: stable
5353
- name: Cache Rust dependencies
54-
uses: actions/cache@v4
54+
uses: actions/cache@v5
5555
with:
5656
path: |
5757
~/.cargo/bin/
@@ -80,7 +80,7 @@ jobs:
8080
exit 1
8181
fi
8282
- name: Setup Gradle
83-
uses: gradle/actions/setup-gradle@v5
83+
uses: gradle/actions/setup-gradle@v6
8484
- name: Build with Gradle
8585
run: ./gradlew assembledebug --stacktrace
8686
- name: Run test cases

.github/workflows/android-main.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,32 +16,32 @@ jobs:
1616
name: Check spotless
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v6
2020
- name: Set up JDK 17
21-
uses: actions/setup-java@v4
21+
uses: actions/setup-java@v5
2222
with:
2323
distribution: "temurin"
2424
java-version: 17
2525
- name: Set up NDK
26-
uses: nttld/setup-ndk@afb4c9964b521afb97c864b7d40b11e6911bd410
26+
uses: nttld/setup-ndk@v1
2727
with:
2828
ndk-version: r28c
2929
link-to-sdk: true
3030
local-cache: true
3131
- name: Setup Gradle
32-
uses: gradle/actions/setup-gradle@v5
32+
uses: gradle/actions/setup-gradle@v6
3333
- name: Check formatting using spotless
3434
run: ./gradlew spotlessCheck
3535

3636
build:
3737
name: Build debug, Jacoco test and publish to codacy
3838
runs-on: ubuntu-latest
3939
steps:
40-
- uses: actions/checkout@v4
40+
- uses: actions/checkout@v6
4141
with:
4242
fetch-depth: 0
4343
- name: Set up JDK 17
44-
uses: actions/setup-java@v4
44+
uses: actions/setup-java@v5
4545
with:
4646
distribution: "temurin"
4747
java-version: 17
@@ -50,7 +50,7 @@ jobs:
5050
with:
5151
toolchain: stable
5252
- name: Cache Rust dependencies
53-
uses: actions/cache@v4
53+
uses: actions/cache@v5
5454
with:
5555
path: |
5656
~/.cargo/bin/
@@ -79,7 +79,7 @@ jobs:
7979
exit 1
8080
fi
8181
- name: Setup Gradle
82-
uses: gradle/actions/setup-gradle@v5
82+
uses: gradle/actions/setup-gradle@v6
8383
- name: Build with Gradle
8484
run: ./gradlew assembledebug
8585
- name: Run test cases
@@ -107,9 +107,9 @@ jobs:
107107
api-level: [ 21, 28 ]
108108
steps:
109109
- name: checkout
110-
uses: actions/checkout@v4
110+
uses: actions/checkout@v6
111111
- name: Java 17
112-
uses: actions/setup-java@v4
112+
uses: actions/setup-java@v5
113113
with:
114114
distribution: "temurin"
115115
java-version: 17
@@ -118,7 +118,7 @@ jobs:
118118
with:
119119
toolchain: stable
120120
- name: Cache Rust dependencies
121-
uses: actions/cache@v4
121+
uses: actions/cache@v5
122122
with:
123123
path: |
124124
~/.cargo/bin/
@@ -152,7 +152,7 @@ jobs:
152152
sudo udevadm control --reload-rules
153153
sudo udevadm trigger --name-match=kvm
154154
- name: AVD cache
155-
uses: actions/cache@v4
155+
uses: actions/cache@v5
156156
id: avd-cache
157157
with:
158158
path: |

.github/workflows/fastlane-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
# required to run on Linux because this is a docker container action
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v6
1717
- uses: ashutoshgngwr/validate-fastlane-supply-metadata@v2
1818
with:
1919
fastlaneDir: ./fastlane/metadata/android # optional

0 commit comments

Comments
 (0)