Skip to content

Commit dca39bf

Browse files
EmmanuelMessTranceLove
authored andcommitted
Sync up Github CI YAML with hotfix/3.11.4 ones
2 parents 77afe92 + 72f45c6 commit dca39bf

7 files changed

Lines changed: 45 additions & 41 deletions

File tree

‎.github/workflows/android-build.yml‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,13 @@ jobs:
2222
distribution: "temurin"
2323
java-version: 17
2424
- name: Set up NDK
25-
uses: nttld/setup-ndk@v1
25+
id: setup-ndk
26+
uses: nttld/setup-ndk@ed92fe6cadad69be94a966a7ee3271275e62f779
2627
with:
2728
ndk-version: r28c
2829
link-to-sdk: true
29-
local-cache: true
3030
- name: Install Rust
31-
uses: dtolnay/rust-toolchain@stable
32-
with:
33-
toolchain: stable
31+
uses: dtolnay/rust-toolchain@1.98.1
3432
- name: Cache Rust dependencies
3533
uses: actions/cache@v5
3634
with:
@@ -63,6 +61,8 @@ jobs:
6361
- name: Setup Gradle
6462
uses: gradle/actions/setup-gradle@v6
6563
- name: Check formatting using spotless
64+
env:
65+
ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
6666
run: ./gradlew spotlessCheck --stacktrace
6767

6868
build:
@@ -75,10 +75,13 @@ jobs:
7575
with:
7676
distribution: "temurin"
7777
java-version: 17
78-
- name: Install Rust
79-
uses: dtolnay/rust-toolchain@stable
78+
- name: Set up NDK
79+
uses: nttld/setup-ndk@ed92fe6cadad69be94a966a7ee3271275e62f779
8080
with:
81-
toolchain: stable
81+
ndk-version: r30
82+
link-to-sdk: true
83+
- name: Install Rust
84+
uses: dtolnay/rust-toolchain@1.98.1
8285
- name: Cache Rust dependencies
8386
uses: actions/cache@v5
8487
with:
@@ -111,4 +114,4 @@ jobs:
111114
- name: Setup Gradle
112115
uses: gradle/actions/setup-gradle@v6
113116
- name: Build with Gradle
114-
run: ./gradlew assembledebug --stacktrace
117+
run: ./gradlew assembleDebug --stacktrace

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
reactions: '+1'
1919
- name: Github API Request
2020
id: request
21-
uses: octokit/request-action@v3
21+
uses: octokit/request-action@b91aabaa861c777dcdb14e2387e30eddf04619ae
2222
with:
2323
route: ${{ github.event.issue.pull_request.url }}
2424
env:
@@ -41,13 +41,12 @@ jobs:
4141
distribution: "temurin"
4242
java-version: 17
4343
- name: Set up NDK
44-
uses: nttld/setup-ndk@v1
44+
uses: nttld/setup-ndk@ed92fe6cadad69be94a966a7ee3271275e62f779
4545
with:
4646
ndk-version: r28c
4747
link-to-sdk: true
48-
local-cache: true
4948
- name: Install Rust
50-
uses: dtolnay/rust-toolchain@stable
49+
uses: dtolnay/rust-toolchain@1.98.1
5150
with:
5251
toolchain: stable
5352
- name: Cache Rust dependencies
@@ -79,10 +78,10 @@ jobs:
7978
echo "❌ .cargo/config.toml missing"
8079
exit 1
8180
fi
82-
- name: Build with Gradle
81+
- name: Setup Gradle
8382
uses: gradle/actions/setup-gradle@v6
84-
with:
85-
arguments: assembleDebug --stacktrace
83+
- name: Build with Gradle
84+
run: ./gradlew assembleDebug --stacktrace
8685
- name: Upload fdroid artifact
8786
uses: actions/upload-artifact@v7
8887
id: artifact-upload-fdroid
@@ -105,7 +104,7 @@ jobs:
105104
echo "PR_Number: $PR_NUMBER"
106105
echo "PR_NUMBER=$PR_NUMBER" >> "$GITHUB_OUTPUT"
107106
- name: Notify the user with a comment once the APK is uploaded
108-
uses: peter-evans/create-or-update-comment@v5
107+
uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9
109108
with:
110109
issue-number: ${{ steps.find-pr-id.outputs.PR_NUMBER }}
111110
body: |

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@ jobs:
1515
distribution: "temurin"
1616
java-version: 17
1717
- name: Set up NDK
18-
uses: nttld/setup-ndk@v1
18+
uses: nttld/setup-ndk@ed92fe6cadad69be94a966a7ee3271275e62f779
1919
with:
2020
ndk-version: r28c
2121
link-to-sdk: true
22-
local-cache: true
2322
- name: Install Rust
2423
uses: dtolnay/rust-toolchain@stable
2524
with:
@@ -53,10 +52,10 @@ jobs:
5352
echo "❌ .cargo/config.toml missing"
5453
exit 1
5554
fi
56-
- name: Build with Gradle
55+
- name: Setup Gradle
5756
uses: gradle/actions/setup-gradle@v6
58-
with:
59-
arguments: assembleDebug
57+
- name: Build with Gradle
58+
run: ./gradlew assembleDebug --stacktrace
6059
- name: Upload fdroid artifact
6160
uses: actions/upload-artifact@v7
6261
with:

‎.github/workflows/android-emulator-ondemand.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,13 @@ jobs:
3232
with:
3333
distribution: "temurin"
3434
java-version: 17
35-
- name: Install Rust
36-
uses: dtolnay/rust-toolchain@stable
35+
- name: Set up NDK
36+
uses: nttld/setup-ndk@ed92fe6cadad69be94a966a7ee3271275e62f779
3737
with:
38-
toolchain: stable
38+
ndk-version: r30
39+
link-to-sdk: true
40+
- name: Install Rust
41+
uses: dtolnay/rust-toolchain@1.98.1
3942
- name: Cache Rust dependencies
4043
uses: actions/cache@v5
4144
with:

‎.github/workflows/android-feature.yml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,10 @@ jobs:
2424
java-version: 17
2525
- name: Set up NDK
2626
id: setup-ndk
27-
uses: nttld/setup-ndk@v1
27+
uses: nttld/setup-ndk@ed92fe6cadad69be94a966a7ee3271275e62f779
2828
with:
2929
ndk-version: r28c
3030
link-to-sdk: true
31-
local-cache: true
3231
- name: Setup Gradle
3332
uses: gradle/actions/setup-gradle@v6
3433
- name: Check formatting using spotless
@@ -46,10 +45,13 @@ jobs:
4645
with:
4746
distribution: "temurin"
4847
java-version: 17
49-
- name: Install Rust
50-
uses: dtolnay/rust-toolchain@stable
48+
- name: Set up NDK
49+
uses: nttld/setup-ndk@ed92fe6cadad69be94a966a7ee3271275e62f779
5150
with:
52-
toolchain: stable
51+
ndk-version: r28c
52+
link-to-sdk: true
53+
- name: Install Rust
54+
uses: dtolnay/rust-toolchain@1.98.1
5355
- name: Cache Rust dependencies
5456
uses: actions/cache@v5
5557
with:
@@ -82,6 +84,6 @@ jobs:
8284
- name: Setup Gradle
8385
uses: gradle/actions/setup-gradle@v6
8486
- name: Build with Gradle
85-
run: ./gradlew assembledebug --stacktrace
87+
run: ./gradlew assembleDebug --stacktrace
8688
- name: Run test cases
87-
run: ./gradlew jacocoTestPlayDebugUnitTestReport --stacktrace --info
89+
run: ./gradlew jacocoTestPlayDebugUnitTestReport --stacktrace --info

‎.github/workflows/android-main.yml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,16 @@ jobs:
2323
distribution: "temurin"
2424
java-version: 17
2525
- name: Set up NDK
26-
uses: nttld/setup-ndk@v1
26+
id: setup-ndk
27+
uses: nttld/setup-ndk@ed92fe6cadad69be94a966a7ee3271275e62f779
2728
with:
2829
ndk-version: r28c
2930
link-to-sdk: true
30-
local-cache: true
3131
- name: Setup Gradle
3232
uses: gradle/actions/setup-gradle@v6
3333
- name: Check formatting using spotless
34+
env:
35+
ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
3436
run: ./gradlew spotlessCheck
3537

3638
build:
@@ -46,9 +48,7 @@ jobs:
4648
distribution: "temurin"
4749
java-version: 17
4850
- name: Install Rust
49-
uses: dtolnay/rust-toolchain@stable
50-
with:
51-
toolchain: stable
51+
uses: dtolnay/rust-toolchain@1.98.1
5252
- name: Cache Rust dependencies
5353
uses: actions/cache@v5
5454
with:
@@ -114,9 +114,7 @@ jobs:
114114
distribution: "temurin"
115115
java-version: 17
116116
- name: Install Rust
117-
uses: dtolnay/rust-toolchain@stable
118-
with:
119-
toolchain: stable
117+
uses: dtolnay/rust-toolchain@1.98.1
120118
- name: Cache Rust dependencies
121119
uses: actions/cache@v5
122120
with:

‎app/src/main/java/com/amaze/filemanager/filesystem/HybridFile.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1117,7 +1117,7 @@ public void close() throws IOException {
11171117
LOG.debug("Closing input stream for {}", getPath());
11181118
super.close();
11191119
} catch (Throwable e) {
1120-
e.printStackTrace();
1120+
LOG.error("Error closing input stream for {}", getPath(), e);
11211121
} finally {
11221122
LOG.debug("Closing client for {}", getPath());
11231123
rf.close();

0 commit comments

Comments
 (0)