Merge pull request #57 from thekyber/master (with some small changes)

polymorphicshade · Apr 21, 2024 · ad42bf9 · ad42bf9
1 parent c765e31
commit ad42bf9
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 25 deletions.
diff --git a/.github/changelog.md b/.github/changelog.md
@@ -0,0 +1 @@
+## TODO: fill in
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -2,11 +2,22 @@ name: Release
 
 on:
   workflow_dispatch:
+    inputs:
+      title:
+        type: string
+        description: 'Title'
+        required: true
+        default: 'v0.00.0 R0'
+      is_pre_release:
+        type: boolean
+        description: 'Set as a pre-release'
+        required: true
+        default: true
 
 jobs:
-  build:
+  build-and-release:
     runs-on: ubuntu-latest
-
+    
     permissions: write-all
 
     steps:
@@ -15,29 +26,37 @@ jobs:
           git clone --no-checkout https://github.com/polymorphicshade/Tubular.git .
           git config core.symlinks false
           git checkout --progress --force ${{ github.ref_name }}
-
+        
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: "temurin"
           cache: 'gradle'
 
-      - name: Decode keystore
-        env:
-            ENCODED_STRING: ${{ secrets.KEYSTORE }}
-        run: |
-            echo $ENCODED_STRING | base64 -di > app/keystore.jks
-      
       - name: Build release APK
+        run: ./gradlew assembleRelease
+
+      - name: Sign APK
         env:
-          SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
-          SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
+          KEYSTORE: ${{ secrets.KEYSTORE }}
           SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
-        run: ./gradlew assembleRelease
+        run: |
+          version=$( grep "versionName" app/build.gradle | awk -F'"' '{print $2}' )
+          echo "${KEYSTORE}" | base64 -d > apksign.keystore
+          ${ANDROID_HOME}/build-tools/34.0.0/apksigner sign --ks apksign.keystore --ks-pass env:SIGNING_STORE_PASSWORD "app/build/outputs/apk/release/app-release-unsigned.apk"
+          mv app/build/outputs/apk/release/app-release-unsigned.apk app/build/outputs/apk/release/"tubular_v${version}.apk"
+
+      - name: Create release and upload
+        run: |
+          version=$( grep "versionName" app/build.gradle | awk -F'"' '{print $2}' )
+          gh auth login --with-token <<<"${{ secrets.GITHUB_TOKEN }}"
+          gh release create "v${version}" --title "${{ inputs.title }}" --notes-file ".github/changelog.md" --prerelease=${{ inputs.is_pre_release }} --repo polymorphicshade/Tubular
+          gh release upload "v${version}" app/build/outputs/apk/release/*.apk --repo polymorphicshade/Tubular
 
-      - name: Upload APK
+      - name: Archive reports for job
         uses: actions/upload-artifact@v4
         with:
-          name: app
-          path: app/build/outputs/apk/release/*.apk
+          name: reports
+          path: '*/build/reports'
+        if: ${{ always() }}
diff --git a/app/build.gradle b/app/build.gradle
@@ -32,15 +32,6 @@ android {
         }
     }
 
-    signingConfigs {
-        release {
-            storeFile file("keystore.jks")
-            storePassword System.getenv("SIGNING_STORE_PASSWORD")
-            keyAlias System.getenv("SIGNING_KEY_ALIAS")
-            keyPassword System.getenv("SIGNING_KEY_PASSWORD")
-        }
-    }
-
     buildTypes {
         debug {
             debuggable true
@@ -60,7 +51,6 @@ android {
         }
 
         release {
-            signingConfig signingConfigs.release
             if (System.properties.containsKey('packageSuffix')) {
                 applicationIdSuffix System.getProperty('packageSuffix')
                 resValue "string", "app_name", "Tubular " + System.getProperty('packageSuffix')