From adbf55fb1f5808e384210b3f0d30c218742017a8 Mon Sep 17 00:00:00 2001 From: RTX3080Ti Date: Sun, 7 Sep 2025 15:34:40 +0200 Subject: [PATCH 1/4] fix: fix workflow fail --- .github/workflows/main.yml | 87 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 83 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bdce85a..72708c4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,20 +22,99 @@ jobs: - name: Get Git commit info id: info run: | - echo "COMMIT_AUTHOR=$(git log -1 --pretty=format:'%an')" >> $GITHUB_ENV - echo "COMMIT_MESSAGE=$(git log -1 --pretty=format:'%s')" >> $GITHUB_ENV - echo "COMMIT_HASH=$(git log -1 --pretty=format:'%h')" >> $GITHUB_ENV + echo "COMMIT_AUTHOR=$(git log -1 --pretty=format:'%an')" >> $GITHUB_ENV + echo "COMMIT_MESSAGE=$(git log -1 --pretty=format:'%s')" >> $GITHUB_ENV + echo "COMMIT_HASH=$(git log -1 --pretty=format:'%h')" >> $GITHUB_ENV - name: Publish uses: tsickert/discord-webhook@v6.0.0 with: webhook-url: ${{ secrets.DISCORD_WEBHOOK }} embed-title: "New build triggered" - embed-description: "*Commit message:* ${{ env.COMMIT_MESSAGE }}\n*Commit hash:* ${{ env.COMMIT_HASH }}\nIf the build succeeds, ill send the APK here." + embed-description: | + *Commit message:* ${{ env.COMMIT_MESSAGE }} + *Commit hash:* ${{ env.COMMIT_HASH }} + *Branch:* ${{ github.ref_name }} + Triggered by **${{ github.actor }}** embed-footer-text: "Triggered by ${{ env.COMMIT_AUTHOR }}" build: runs-on: ubuntu-latest + steps: + - name: Checking out branch + uses: actions/checkout@v4 + + - name: Init submodules + uses: snickerbockers/submodules-init@v4 + + - name: Setup Gradle + uses: gradle/gradle-build-action@v2 + with: + gradle-version: 8.14.3 + + - name: Setup Java + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: 21 + + - name: Build library + run: ./gradlew library:assemble --stacktrace + + - name: Build developer APK + run: | + ./gradlew assembleRelease --stacktrace + mkdir out + cp app/build/outputs/apk/release/app-release-unsigned.apk out/app-dev-unsigned.apk + + - name: Gen MD5sum + run: | + md5sum app/build/outputs/apk/release/app-release-unsigned.apk > out/app-dev-unsigned.md5 + + # You only get a signed APK for the main repo + - name: Sign APK + if: github.repository_owner == 'BeboKhouja' + uses: r0adkll/sign-android-release@v1 + id: sign + with: + releaseDirectory: app/build/outputs/apk/release + signingKeyBase64: ${{ secrets.KEYSTORE_BASE_64 }} + alias: ${{ secrets.RELEASE_KEYSTORE_ALIAS }} + keyStorePassword: ${{ secrets.RELEASE_KEY_PASSWORD }} + keyPassword: ${{ secrets.RELEASE_KEY_PASSWORD }} + + - name: Copy Signed APK + if: github.repository_owner == 'BeboKhouja' + run: | + cp ${{steps.sign.outputs.signedReleaseFile}} out/app-dev.apk + md5sum ${{steps.sign.outputs.signedReleaseFile}} > out/app-dev.md5 + + - name: Upload artifact + uses: actions/upload-artifact@v4 + with: + name: dev-artifacts + path: out/ + + sendFile: + name: Send file to Discord + runs-on: ubuntu-latest + if: github.repository_owner == 'BeboKhouja' + needs: build + continue-on-error: true + steps: + - name: Download Dev Artifact + uses: actions/download-artifact@v4.1.8 + with: + name: dev-artifacts + path: ./out/apk + + - name: Send APK to builds channel + uses: sinshutu/upload-to-discord@master + env: + DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} + with: + args: ./out/apk/app-dev.apk ./out/apk/app-dev.md5 build: + runs-on: ubuntu-latest steps: - name: Checking out branch uses: actions/checkout@v3 From 85af0df14f3cfa7755d50f8fce39ccb28a480d96 Mon Sep 17 00:00:00 2001 From: RTX3080Ti Date: Sun, 7 Sep 2025 15:36:26 +0200 Subject: [PATCH 2/4] fix: fix in workflow --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 72708c4..d5aa433 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -188,6 +188,6 @@ jobs: - name: Send APK to builds channel uses: sinshutu/upload-to-discord@master env: - DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} + DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} with: - args: ./out/apk/app-dev.apk ./out/apk/app-dev.md5 + args: ./out/apk/app-dev.apk ./out/apk/app-dev.md5 From 154147834673309a7fea1929d02ded5ec28b3e14 Mon Sep 17 00:00:00 2001 From: RTX3080Ti Date: Sun, 7 Sep 2025 15:37:53 +0200 Subject: [PATCH 3/4] fix: fix workflow fail --- .github/workflows/main.yml | 77 -------------------------------------- 1 file changed, 77 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d5aa433..1fc03f5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -95,83 +95,6 @@ jobs: name: dev-artifacts path: out/ - sendFile: - name: Send file to Discord - runs-on: ubuntu-latest - if: github.repository_owner == 'BeboKhouja' - needs: build - continue-on-error: true - steps: - - name: Download Dev Artifact - uses: actions/download-artifact@v4.1.8 - with: - name: dev-artifacts - path: ./out/apk - - - name: Send APK to builds channel - uses: sinshutu/upload-to-discord@master - env: - DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} - with: - args: ./out/apk/app-dev.apk ./out/apk/app-dev.md5 build: - runs-on: ubuntu-latest - steps: - - name: Checking out branch - uses: actions/checkout@v3 - - - name: Init submodules - uses: snickerbockers/submodules-init@v4 - - - name: Setup Gradle - uses: gradle/gradle-build-action@v2 - with: - gradle-version: 8.14.3 - - - name: Setup Java - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: 21 - - - name: Build library - run: gradle library:assemble --stacktrace - - - name: Build developer APK - run: | - gradle assembleRelease --stacktrace - mkdir out - cp app/build/outputs/apk/release/app-release-unsigned.apk out/app-dev-unsigned.apk - - - name: ZipAlign & Sign Android release - uses: kevin-david/zipalign-sign-android-release@v2.0.1 - if: github.repository_owner == 'BeboKhouja' - id: sign - with: - releaseDirectory: app/build/outputs/apk/release - signingKeyBase64: ${{ secrets.KEYSTORE_BASE_64 }} - alias: ${{ secrets.RELEASE_KEYSTORE_ALIAS }} - keyStorePassword: ${{ secrets.RELEASE_KEY_PASSWORD }} - keyPassword: ${{ secrets.RELEASE_KEY_PASSWORD }} - zipAlign: true - - - name: Gen MD5sum - run: | - md5sum app/build/outputs/apk/release/app-release-unsigned.apk > out/app-dev-unsigned.md5 - - # You only get an unsigned APK for forks - - - name: Copy Signed APK - if: github.repository_owner == 'BeboKhouja' - run: | - cp ${{steps.sign.outputs.signedReleaseFile}} out/app-dev.apk - md5sum ${{steps.sign.outputs.signedReleaseFile}} > out/app-dev.md5 - - - name: Upload artifact - uses: actions/upload-artifact@v4 - with: - name: dev-artifacts - path: out/ - sendFile: name: Send file to Discord runs-on: ubuntu-latest From 9211c796ea2adbbc86513700bfd1c9d6c6279488 Mon Sep 17 00:00:00 2001 From: RTX3080Ti Date: Sun, 7 Sep 2025 15:40:04 +0200 Subject: [PATCH 4/4] fix: fix workflow fail --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1fc03f5..9bd98c7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -58,6 +58,9 @@ jobs: distribution: 'temurin' java-version: 21 + - name: Make gradlew executable + run: chmod +x ./gradlew + - name: Build library run: ./gradlew library:assemble --stacktrace