From 8c35320d5e870ec29b36507f9a41414ec9e40f2b Mon Sep 17 00:00:00 2001 From: CreativeCodeCat Date: Thu, 8 Jan 2026 01:19:21 +0000 Subject: [PATCH 1/6] Update nightly-release.yml Signed-off-by: CreativeCodeCat --- .github/workflows/nightly-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml index 62f74004b..bb98ab487 100644 --- a/.github/workflows/nightly-release.yml +++ b/.github/workflows/nightly-release.yml @@ -79,7 +79,7 @@ jobs: - name: Rename files run: | mkdir -p ./build/release/ - mv app/build/outputs/apk/nightlyRelease/*.apk ./build/release/mLauncher-Nightly-Signed.apk + mv app/build/outputs/apk/nightly/release/*.apk ./build/release/mLauncher-Nightly-Signed.apk shell: bash - name: Create and Upload Release From fe7a67109f68c135c77390879ac54f5ab39777bc Mon Sep 17 00:00:00 2001 From: CreativeCodeCat Date: Thu, 8 Jan 2026 01:23:12 +0000 Subject: [PATCH 2/6] Update android-branch_ci.yml Signed-off-by: CreativeCodeCat --- .github/workflows/android-branch_ci.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/android-branch_ci.yml b/.github/workflows/android-branch_ci.yml index 17dbeadad..12b50840f 100644 --- a/.github/workflows/android-branch_ci.yml +++ b/.github/workflows/android-branch_ci.yml @@ -13,12 +13,6 @@ jobs: build: name: Build, Sign & Upload runs-on: ubuntu-latest - env: - KEY_STORE_FILE: ${{ secrets.SIGNINGKEY_BASE64 }} # optional if using a file from env - KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }} - KEY_ALIAS: ${{ secrets.KEY_ALIAS }} - KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} - steps: - name: Checkout project uses: actions/checkout@v6.0.1 @@ -42,4 +36,9 @@ jobs: - name: Build with Gradle run: ./gradlew clean assembleProdDebug --refresh-dependencies --no-daemon env: - JAVA_TOOL_OPTIONS: "-Dhttps.protocols=TLSv1.2" \ No newline at end of file + JAVA_TOOL_OPTIONS: "-Dhttps.protocols=TLSv1.2" + KEY_STORE_FILE: ${{ steps.write_base64_file.outputs.filePath }} + KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }} + KEY_ALIAS: ${{ secrets.KEY_ALIAS }} + KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} + From 717fb884e1eea8dcaf8187f14f11a7e2e0c77f13 Mon Sep 17 00:00:00 2001 From: CreativeCodeCat Date: Thu, 8 Jan 2026 01:24:27 +0000 Subject: [PATCH 3/6] Update nightly-release.yml Signed-off-by: CreativeCodeCat --- .github/workflows/nightly-release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml index bb98ab487..e1143a725 100644 --- a/.github/workflows/nightly-release.yml +++ b/.github/workflows/nightly-release.yml @@ -61,7 +61,6 @@ jobs: KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }} KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} - - name: Extract Version id: extract_version From b9051e34985d871e34eef4eaf6059a5a52e3c334 Mon Sep 17 00:00:00 2001 From: CreativeCodeCat Date: Thu, 8 Jan 2026 01:25:23 +0000 Subject: [PATCH 4/6] Update android-branch_ci.yml Signed-off-by: CreativeCodeCat --- .github/workflows/android-branch_ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/android-branch_ci.yml b/.github/workflows/android-branch_ci.yml index 12b50840f..5b1c8f435 100644 --- a/.github/workflows/android-branch_ci.yml +++ b/.github/workflows/android-branch_ci.yml @@ -33,6 +33,14 @@ jobs: - name: Stop Gradle daemons run: ./gradlew --stop + - name: Decode keystore + id: write_base64_file + uses: Swisyn/Base64-hash-to-file@v1.0 + with: + destinationFileName: 'mLauncher.jks' + destinationPath: 'app' + encodedString: ${{ secrets.SIGNINGKEY_BASE64 }} + - name: Build with Gradle run: ./gradlew clean assembleProdDebug --refresh-dependencies --no-daemon env: From 19077ee1d77c995e353d8cf51740cb3aeaf33fc1 Mon Sep 17 00:00:00 2001 From: CreativeCodeCat Date: Thu, 8 Jan 2026 01:26:51 +0000 Subject: [PATCH 5/6] Update android-pr_ci.yml Signed-off-by: CreativeCodeCat --- .github/workflows/android-pr_ci.yml | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/.github/workflows/android-pr_ci.yml b/.github/workflows/android-pr_ci.yml index e0a7dfc42..318319173 100644 --- a/.github/workflows/android-pr_ci.yml +++ b/.github/workflows/android-pr_ci.yml @@ -11,12 +11,6 @@ jobs: build: name: Build, Sign & Upload runs-on: ubuntu-latest - env: - KEY_STORE_FILE: ${{ secrets.SIGNINGKEY_BASE64 }} # optional if using a file from env - KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }} - KEY_ALIAS: ${{ secrets.KEY_ALIAS }} - KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} - steps: - name: Checkout project uses: actions/checkout@v6.0.1 @@ -37,7 +31,20 @@ jobs: - name: Stop Gradle daemons run: ./gradlew --stop + - name: Decode keystore + id: write_base64_file + uses: Swisyn/Base64-hash-to-file@v1.0 + with: + destinationFileName: 'mLauncher.jks' + destinationPath: 'app' + encodedString: ${{ secrets.SIGNINGKEY_BASE64 }} + - name: Build with Gradle run: ./gradlew clean assembleProdDebug --refresh-dependencies --no-daemon env: - JAVA_TOOL_OPTIONS: "-Dhttps.protocols=TLSv1.2" \ No newline at end of file + JAVA_TOOL_OPTIONS: "-Dhttps.protocols=TLSv1.2" + KEY_STORE_FILE: ${{ steps.write_base64_file.outputs.filePath }} + KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }} + KEY_ALIAS: ${{ secrets.KEY_ALIAS }} + KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} + From 529ed32183e3e944e0370f5bc07cc284a07c17e5 Mon Sep 17 00:00:00 2001 From: CreativeCodeCat Date: Thu, 8 Jan 2026 01:28:37 +0000 Subject: [PATCH 6/6] Update android-release_ci.yml Signed-off-by: CreativeCodeCat --- .github/workflows/android-release_ci.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/android-release_ci.yml b/.github/workflows/android-release_ci.yml index 6b9cc335f..9612408b5 100644 --- a/.github/workflows/android-release_ci.yml +++ b/.github/workflows/android-release_ci.yml @@ -11,12 +11,6 @@ jobs: name: Build, Sign & Release if: "!startsWith(github.ref_name, 'nightly')" runs-on: ubuntu-latest - env: - KEY_STORE_FILE: ${{ secrets.SIGNINGKEY_BASE64 }} # optional if using a file from env - KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }} - KEY_ALIAS: ${{ secrets.KEY_ALIAS }} - KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} - steps: - name: Checkout project uses: actions/checkout@v6.0.1 @@ -37,10 +31,22 @@ jobs: - name: Stop Gradle daemons run: ./gradlew --stop + - name: Decode keystore + id: write_base64_file + uses: Swisyn/Base64-hash-to-file@v1.0 + with: + destinationFileName: 'mLauncher.jks' + destinationPath: 'app' + encodedString: ${{ secrets.SIGNINGKEY_BASE64 }} + - name: Build run: ./gradlew clean assembleProdRelease --refresh-dependencies --no-daemon && ./gradlew clean bundleProdRelease --refresh-dependencies --no-daemon env: JAVA_TOOL_OPTIONS: "-Dhttps.protocols=TLSv1.2" + KEY_STORE_FILE: ${{ steps.write_base64_file.outputs.filePath }} + KEY_STORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} + KEY_ALIAS: ${{ secrets.KEY_ALIAS }} + KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} - name: Release to GitHub uses: svenstaro/upload-release-action@2.11.3