Skip to content

Commit 4df0d11

Browse files
CreativeCodeCatCreativeCodeCat
committed
Update keystore path and password in nightly release
Signed-off-by: CreativeCodeCat <[email protected]>
1 parent 1933b91 commit 4df0d11

File tree

6 files changed

+60
-39
lines changed

6 files changed

+60
-39
lines changed

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

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@ jobs:
1313
build:
1414
name: Build, Sign & Upload
1515
runs-on: ubuntu-latest
16-
env:
17-
KEY_STORE_FILE: ${{ secrets.SIGNINGKEY_BASE64 }} # optional if using a file from env
18-
KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
19-
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
20-
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
21-
2216
steps:
2317
- name: Checkout project
2418
uses: actions/[email protected]
@@ -39,7 +33,20 @@ jobs:
3933
- name: Stop Gradle daemons
4034
run: ./gradlew --stop
4135

36+
- name: Decode keystore
37+
id: write_base64_file
38+
uses: Swisyn/[email protected]
39+
with:
40+
destinationFileName: 'mLauncher.jks'
41+
destinationPath: 'app'
42+
encodedString: ${{ secrets.SIGNINGKEY_BASE64 }}
43+
4244
- name: Build with Gradle
4345
run: ./gradlew clean assembleProdDebug --refresh-dependencies --no-daemon
4446
env:
45-
JAVA_TOOL_OPTIONS: "-Dhttps.protocols=TLSv1.2"
47+
JAVA_TOOL_OPTIONS: "-Dhttps.protocols=TLSv1.2"
48+
KEY_STORE_FILE: ${{ steps.write_base64_file.outputs.filePath }}
49+
KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
50+
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
51+
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
52+

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

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@ jobs:
1111
build:
1212
name: Build, Sign & Upload
1313
runs-on: ubuntu-latest
14-
env:
15-
KEY_STORE_FILE: ${{ secrets.SIGNINGKEY_BASE64 }} # optional if using a file from env
16-
KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
17-
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
18-
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
19-
2014
steps:
2115
- name: Checkout project
2216
uses: actions/[email protected]
@@ -37,7 +31,19 @@ jobs:
3731
- name: Stop Gradle daemons
3832
run: ./gradlew --stop
3933

34+
- name: Decode keystore
35+
id: write_base64_file
36+
uses: Swisyn/[email protected]
37+
with:
38+
destinationFileName: 'mLauncher.jks'
39+
destinationPath: 'app'
40+
encodedString: ${{ secrets.SIGNINGKEY_BASE64 }}
41+
4042
- name: Build with Gradle
4143
run: ./gradlew clean assembleProdDebug --refresh-dependencies --no-daemon
4244
env:
43-
JAVA_TOOL_OPTIONS: "-Dhttps.protocols=TLSv1.2"
45+
JAVA_TOOL_OPTIONS: "-Dhttps.protocols=TLSv1.2"
46+
KEY_STORE_FILE: ${{ steps.write_base64_file.outputs.filePath }}
47+
KEY_STORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
48+
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
49+
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}

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

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@ jobs:
1111
build:
1212
name: Build, Sign & Upload
1313
runs-on: ubuntu-latest
14-
env:
15-
KEY_STORE_FILE: ${{ secrets.SIGNINGKEY_BASE64 }} # optional if using a file from env
16-
KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
17-
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
18-
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
19-
2014
steps:
2115
- name: Checkout project
2216
uses: actions/[email protected]
@@ -37,7 +31,20 @@ jobs:
3731
- name: Stop Gradle daemons
3832
run: ./gradlew --stop
3933

34+
- name: Decode keystore
35+
id: write_base64_file
36+
uses: Swisyn/[email protected]
37+
with:
38+
destinationFileName: 'mLauncher.jks'
39+
destinationPath: 'app'
40+
encodedString: ${{ secrets.SIGNINGKEY_BASE64 }}
41+
4042
- name: Build with Gradle
4143
run: ./gradlew clean assembleProdDebug --refresh-dependencies --no-daemon
4244
env:
43-
JAVA_TOOL_OPTIONS: "-Dhttps.protocols=TLSv1.2"
45+
JAVA_TOOL_OPTIONS: "-Dhttps.protocols=TLSv1.2"
46+
KEY_STORE_FILE: ${{ steps.write_base64_file.outputs.filePath }}
47+
KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
48+
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
49+
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
50+

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@ jobs:
1111
name: Build, Sign & Release
1212
if: "!startsWith(github.ref_name, 'nightly')"
1313
runs-on: ubuntu-latest
14-
env:
15-
KEY_STORE_FILE: ${{ secrets.SIGNINGKEY_BASE64 }} # optional if using a file from env
16-
KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
17-
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
18-
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
19-
2014
steps:
2115
- name: Checkout project
2216
uses: actions/[email protected]
@@ -37,10 +31,22 @@ jobs:
3731
- name: Stop Gradle daemons
3832
run: ./gradlew --stop
3933

34+
- name: Decode keystore
35+
id: write_base64_file
36+
uses: Swisyn/[email protected]
37+
with:
38+
destinationFileName: 'mLauncher.jks'
39+
destinationPath: 'app'
40+
encodedString: ${{ secrets.SIGNINGKEY_BASE64 }}
41+
4042
- name: Build
4143
run: ./gradlew clean assembleProdRelease --refresh-dependencies --no-daemon && ./gradlew clean bundleProdRelease --refresh-dependencies --no-daemon
4244
env:
4345
JAVA_TOOL_OPTIONS: "-Dhttps.protocols=TLSv1.2"
46+
KEY_STORE_FILE: ${{ steps.write_base64_file.outputs.filePath }}
47+
KEY_STORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
48+
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
49+
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
4450

4551
- name: Release to GitHub
4652
uses: svenstaro/[email protected]

‎.github/workflows/nightly-release.yml‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ jobs:
2020
env:
2121
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2222
run: bash clearRelease.sh
23-
24-
23+
2524
build:
2625
name: Build, Sign & Release
2726
runs-on: ubuntu-latest
@@ -51,19 +50,15 @@ jobs:
5150
uses: Swisyn/[email protected]
5251
with:
5352
destinationFileName: 'mLauncher.jks'
54-
destinationPath: './app/'
55-
encodedString: ${{ secrets.KEYSTORE_BASE64 }}
56-
57-
- name: test
58-
run: keytool -list -keystore ${{ steps.write_base64_file.outputs.filepath }} -storepass ${{ secrets.KEY_PASSWORD }}
59-
53+
destinationPath: 'app'
54+
encodedString: ${{ secrets.SIGNINGKEY_BASE64 }}
6055

6156
- name: Build with Gradle
6257
run: ./gradlew clean assembleNightlyRelease --refresh-dependencies --no-daemon
6358
env:
6459
JAVA_TOOL_OPTIONS: "-Dhttps.protocols=TLSv1.2"
6560
KEY_STORE_FILE: ${{ steps.write_base64_file.outputs.filePath }}
66-
KEY_STORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
61+
KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
6762
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
6863
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
6964

@@ -83,7 +78,7 @@ jobs:
8378
- name: Rename files
8479
run: |
8580
mkdir -p ./build/release/
86-
mv app/build/outputs/apk/nightlyRelease/*.apk ./build/release/mLauncher-Nightly-Signed.apk
81+
mv app/build/outputs/apk/nightly/release/*.apk ./build/release/mLauncher-Nightly-Signed.apk
8782
shell: bash
8883

8984
- name: Create and Upload Release

‎app/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ plugins {
1414
val major = 1
1515
val minor = 11
1616
val patch = 3
17-
val build = 3
17+
val build = 4
1818

19-
val baseVersionName = "$major.$minor.$patch"
19+
val baseVersionName = "$major.$minor.$patch Build $build"
2020

2121
val versionCodeBase =
2222
(String.format("%02d", major) +

0 commit comments

Comments
 (0)