diff --git a/.github/workflows/main.yml b/.github/workflows/ci.yml similarity index 57% rename from .github/workflows/main.yml rename to .github/workflows/ci.yml index c365e336..a91674a9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/ci.yml @@ -18,30 +18,20 @@ jobs: steps: - name: Checkout uses: actions/checkout@v1 + - name: Validate Gradle Wrapper uses: gradle/wrapper-validation-action@v1 + - name: Setup JDK uses: actions/setup-java@v3 with: distribution: 'temurin' java-version: 17 cache: "gradle" + - name: Build APK run: bash ./gradlew assembleDebug --stacktrace - - name: Sign Apk - continue-on-error: true - id: sign_apk - uses: ilharp/sign-android-release@v1 - with: - releaseDir: app/build/outputs/apk/debug - signingKey: ${{ secrets.ANDROID_SIGNING_KEY }} - keyAlias: ${{ secrets.ANDROID_KEY_ALIAS }} - keyStorePassword: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }} - keyPassword: ${{ secrets.ANDROID_KEY_PASSWORD }} - - name: Remove file that aren't signed - continue-on-error: true - run: | - ls | grep 'signed\.apk$' && find . -type f -name '*.apk' ! -name '*-signed.apk' -delete + - name: Upload APK uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 49ac5b1a..00000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: Create Release Apk - -on: workflow_dispatch - -jobs: - debug-builds: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v1 - - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@v1 - - name: Setup JDK - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: 17 - cache: "gradle" - - name: Build APK - run: bash ./gradlew assembleRelease --stacktrace - - name: Sign Apk - continue-on-error: true - id: sign_apk - uses: ilharp/sign-android-release@v1 - with: - releaseDir: app/build/outputs/apk/release - signingKey: ${{ secrets.ANDROID_SIGNING_KEY }} - keyAlias: ${{ secrets.ANDROID_KEY_ALIAS }} - keyStorePassword: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }} - keyPassword: ${{ secrets.ANDROID_KEY_PASSWORD }} - - name: Remove file that aren't signed - continue-on-error: true - run: | - ls | grep 'signed\.apk$' && find . -type f -name '*.apk' ! -name '*-signed.apk' -delete - - name: Upload APK - uses: actions/upload-artifact@v3 - with: - name: app-release - path: app/build/outputs/apk/release/*.apk