feat: add rebase scripts

Author: nphausg

.github/workflows/app-build.yml

@@ -1,44 +1,37 @@
-# Copyright (C) 2020 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-name: Android CI
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: set up JDK 17
-        uses: actions/setup-java@v1
-        with:
-          java-version: 17
-      - name: Build project
-        run:  chmod +x .github/scripts/gradlew_recursive.sh ; .github/scripts/gradlew_recursive.sh assembleDebug
-      - name: Zip artifacts
-        run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so'
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v1
-        with:
-          name: assemble
-          path: assemble.zip
+# name: assembleDebug
+
+# on:
+#   push:
+#     branches: [ develop ]
+#   pull_request:
+#     branches: [ develop ]
+
+# jobs:
+
+#   build:
+#     name: Build
+#     runs-on: ubuntu-20.04
+#     steps:
+#       - uses: actions/checkout@v1
+
+#       - name: set up JDK 17
+#         uses: actions/setup-java@v1
+#         with:
+#           java-version: 17
+
+#       - name: Clean
+#         run: |
+#           ./scripts/cleanup.sh
+
+#       - name: Build APK
+#         run:  chmod +x .github/scripts/gradlew_recursive.sh ; .github/scripts/gradlew_recursive.sh assembleDebug
+          
+#       - name: Zip artifacts
+#         run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so'
+
+#       - name: Upload artifacts
+#         uses: actions/upload-artifact@v1
+#         with:
+#           name: assembleDebug
+#           path: assembleDebug.zip
 

.github/workflows/deploy-apk.yml

@@ -1,36 +1,60 @@
-name: Deploy APK on GitHub
+name: assembleRelease
 
+# on:
+#   release:
+#     types:
+#       - created
 on:
-  release:
-    types:
-      - created
+  push:
+    branches: [ develop ]
 
 permissions:
   contents: write
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
       - uses: actions/checkout@v1
       - name: set up JDK 17
         uses: actions/setup-java@v1
         with:
           java-version: 17
-      
-      - name: Build APK
-        run: bash gradlew app:assembleRelease
 
-      - uses: r0adkll/[email protected]
-        name: Sign APK
+      - name: Build APK + AAB
+        run: |
+          ls /usr/local/lib/android/sdk/build-tools/
+          chmod +x .github/scripts/gradlew_recursive.sh ; .github/scripts/gradlew_recursive.sh assembleRelease
+          chmod +x .github/scripts/gradlew_recursive.sh ; .github/scripts/gradlew_recursive.sh bundleRelease
+
+      - name: Move files
+        run: |
+          mv app/build/outputs/apk/release/app-release-unsigned.apk app/build/outputs/app-release.apk
+          mv app/build/outputs/bundle/release/app-release.aab app/build/outputs/app-release.aab
+
+      - name: Sign APK + AAB
+        uses: r0adkll/sign-android-release@v1
         id: sign_app
         with:
-          releaseDirectory: app/build/outputs/apk/release
-          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
-          alias:  ${{ secrets.KEY_ALIAS }}
-          keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
-          keyPassword: ${{ secrets.KEY_PASSWORD }}
+          releaseDirectory: app/build/outputs
+          signingKeyBase64: ${{ secrets.ANDROID_SIGNING_KEY }}
+          alias: ${{ secrets.ANDROID_KEY_ALIAS }}
+          keyStorePassword: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
+          keyPassword: ${{ secrets.ANDROID_KEY_PASSWORD }}
+        env:
+          BUILD_TOOLS_VERSION: "35.0.1"
+
+      - name: Build Changelog
+        uses: ardalanamini/auto-changelog@v3
+        with:
+          mention-authors: false
+          mention-new-contributors: false
+          include-compare: false
+          semver: false
+
+      - name: Echo APK
+        run: echo Signed APK FILE ${{steps.sign_app.outputs.signedReleaseFile}}
 
       - uses: svenstaro/upload-release-action@v2
         name: Upload APK