Skip to content

Commit 844bc29

Browse files
eritpchyeritpchy
committed
Update ci build script
1 parent 2347533 commit 844bc29

File tree

3 files changed

+48
-21
lines changed

3 files changed

+48
-21
lines changed

‎.github/workflows/android.yml‎

Lines changed: 44 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,39 +18,55 @@ jobs:
1818
with:
1919
format: YYYYMMDD-HH
2020
utcOffset: "+08:00"
21-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v4
2222
with:
2323
submodules: recursive
24-
- name: Decode Keystore
25-
env:
26-
ENCODED_STRING: ${{ secrets.SIGNING_STORE_BASE64 }}
27-
run: echo $ENCODED_STRING | base64 -di > app/keystore.jks
28-
- uses: AdoptOpenJDK/install-jdk@v1
24+
- name: Install dependencies
25+
run: |
26+
sudo apt-get update
27+
sudo apt-get install -y libarchive-zip-perl
28+
- name: Decode proguard rules
29+
uses: mobiledevops/secret-to-file-action@v1
2930
with:
30-
version: '17'
31-
architecture: x64
31+
base64-encoded-secret: ${{ secrets.PROGUARD_RULES }}
32+
filename: "app/proguard-rules.pro"
33+
- name: Decode keystore
34+
uses: mobiledevops/secret-to-file-action@v1
35+
with:
36+
base64-encoded-secret: ${{ secrets.SIGNING_STORE_BASE64 }}
37+
filename: "app/keystore.jks"
3238
- uses: AdoptOpenJDK/install-jdk@v1
3339
with:
34-
version: '15'
40+
version: '17'
3541
architecture: x64
36-
targets: 'JAVA_HOME_15'
3742
- name: Build Riru modules
3843
run: cd ./module && bash ./make.sh
44+
env:
45+
BUILD_RELEASE_MINIFYENABLED: ${{ vars.BUILD_RELEASE_MINIFYENABLED }}
46+
SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
47+
SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
48+
SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
3949
- name: Grant execute permission for gradlew
4050
run: chmod +x gradlew
4151
- name: Build with Gradle
42-
run: ./gradlew clean ":app:assembleRelease"
52+
run: ./gradlew clean && ./gradlew ":app:assembleRelease" -Pxposed=true
4353
env:
54+
BUILD_RELEASE_MINIFYENABLED: ${{ vars.BUILD_RELEASE_MINIFYENABLED }}
4455
SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
4556
SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
4657
SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
4758
- name: Upload Apk
48-
uses: actions/upload-artifact@v2.2.0
59+
uses: actions/upload-artifact@v4
4960
with:
5061
name: xposed.${{ steps.current-time.outputs.formattedTime }}
5162
path: app/build/outputs/apk/release/*.apk
63+
- name: Upload Mapping
64+
uses: actions/upload-artifact@v4
65+
with:
66+
name: mapping.${{ steps.current-time.outputs.formattedTime }}
67+
path: app/build/outputs/mapping/release
5268
- name: Upload Riru Modules
53-
uses: actions/upload-artifact@v2.2.0
69+
uses: actions/upload-artifact@v4
5470
with:
5571
name: magisk.${{ steps.current-time.outputs.formattedTime }}
5672
path: |
@@ -73,10 +89,22 @@ jobs:
7389
name: "${{ env.release_version }}"
7490
tag_name: "${{ env.release_version }}-ci"
7591
files: |
76-
app/build/outputs/apk/release/*.apk
7792
module/build/release/*.zip
93+
app/build/outputs/apk/release/*.apk
94+
app/build/outputs/mapping/release/mapping.txt
7895
body: "[Github Action](https://github.com/${{github.repository}}/actions/runs/${{github.run_id}})"
96+
- name: Check WebDAV credentials
97+
id: check-webdav
98+
run: |
99+
if [[ -n "${{ secrets.WEBDAV_ADDRESS }}" && -n "${{ secrets.WEBDAV_USERNAME }}" && -n "${{ secrets.WEBDAV_PASSWORD }}" ]]; then
100+
echo "webdav_available=true" >> $GITHUB_OUTPUT
101+
echo "WebDAV credentials are available"
102+
else
103+
echo "webdav_available=false" >> $GITHUB_OUTPUT
104+
echo "WebDAV credentials are missing or incomplete"
105+
fi
79106
- name: Upload artifacts - Xposed
107+
if: steps.check-webdav.outputs.webdav_available == 'true'
80108
uses: Wandalen/wretry.action@master
81109
with:
82110
action: bxb100/action-upload@main
@@ -92,6 +120,7 @@ jobs:
92120
attempt_limit: 3
93121
attempt_delay: 0
94122
- name: Upload artifacts - Zygisk
123+
if: steps.check-webdav.outputs.webdav_available == 'true'
95124
uses: Wandalen/wretry.action@master
96125
with:
97126
action: bxb100/action-upload@main
@@ -107,6 +136,7 @@ jobs:
107136
attempt_limit: 3
108137
attempt_delay: 0
109138
- name: Upload artifacts - Riru
139+
if: steps.check-webdav.outputs.webdav_available == 'true'
110140
uses: Wandalen/wretry.action@master
111141
with:
112142
action: bxb100/action-upload@main

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ android {
1313

1414
buildTypes {
1515
release {
16-
minifyEnabled false
17-
shrinkResources false
16+
minifyEnabled System.getenv("BUILD_RELEASE_MINIFYENABLED")?.toBoolean() ?: false
17+
shrinkResources System.getenv("BUILD_RELEASE_MINIFYENABLED")?.toBoolean() ?: false
1818
zipAlignEnabled true
1919
proguardFiles 'proguard-rules.pro'
2020
}

‎app/debug.gradle‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ext {
22
adbPath = "${android.getSdkDirectory()}/platform-tools/adb"
3-
buildXposed = false
3+
xposed = project.findProperty('xposed')?.toBoolean() ?: false
44
}
55
def adbPushToAppFiles(dexPath, targetName, targetPackage) {
66
exec {
@@ -50,7 +50,7 @@ android.applicationVariants.all { variant ->
5050
def dexTask = tasks.findByName(isMinifyEnabled ? "minify${buildTypeNameCapitalize}WithR8" : "mergeDex${buildTypeNameCapitalize}")
5151
if (minifyTask) {
5252
minifyTask.doFirst {
53-
if (buildXposed) {
53+
if (xposed) {
5454
return
5555
}
5656
def aaptRulesFile = file("${buildDir}/intermediates/aapt_proguard_file/release/aapt_rules.txt")
@@ -59,9 +59,6 @@ android.applicationVariants.all { variant ->
5959
}
6060
}
6161
}
62-
tasks.create(name: "assemble${buildTypeNameCapitalize}Xposed", dependsOn: [variant.assemble]) {
63-
buildXposed = true
64-
}
6562

6663
project.ext.appInfo.each {entry ->
6764
def name = entry.key

0 commit comments

Comments
 (0)