ci: Improve build workflow (#1668)

.github/workflows/release-build.yml

@@ -11,7 +11,7 @@ on:
       - "android/**"
       - "assets/**"
       - "lib/**"
-      - ".releaserc.*"
+      - ".releaserc.js"
       - "pubspec.yaml"
 
 jobs:
@@ -40,20 +40,6 @@ jobs:
       - name: Setup semantic-release
         run: npm install
 
-      - name: Get version code
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          npx semantic-release --extends ./.releaserc.getversion.json --no-ci --dry-run
-          echo "RELEASE_VERSION=v$(cat .VERSION)" >> $GITHUB_ENV
-
-      - name: Bump pubspec version
-        run: |
-          VERSION=$(echo "${RELEASE_VERSION}" | sed 's/v//')
-          IFS='.' read -r -a nums <<< "${VERSION/-dev/}.0"
-          VERSIONCODE=$((nums[0] * 100000000 + nums[1] * 100000 + nums[2] * 100 + nums[3]))
-          sed -i "/^version/c\\version: $VERSION+$VERSIONCODE" pubspec.yaml
-
       - name: Set up Flutter
         run: flutter pub get
 
@@ -61,22 +47,12 @@ jobs:
         run: dart run build_runner build --delete-conflicting-outputs
 
       - name: Build with Flutter
-        run: flutter build apk
+        env:
-
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Sign APK
+          signingKey: "keystore.jks"
-        id: sign_apk
-        uses: ilharp/sign-android-release@v1
-        with:
-          releaseDir: build/app/outputs/apk/release
-          signingKey: ${{ secrets.SIGNING_KEYSTORE }}
           keyStorePassword: ${{ secrets.SIGNING_KEYSTORE_PASSWORD }}
           keyAlias: ${{ secrets.SIGNING_KEY_ALIAS }}
           keyPassword: ${{ secrets.SIGNING_KEY_PASSWORD }}
-
+        run: |
-      - name: Rename APK
+          echo "${{ secrets.SIGNING_KEYSTORE }}" | base64 --decode > android/app/keystore.jks
-        run: mv ${{steps.sign_apk.outputs.signedFile}} revanced-manager-${{ env.RELEASE_VERSION }}.apk
+          npx semantic-release
-      
-      - name: Publish release APK
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: npx semantic-release --extends ./.releaserc.release.json

.releaserc.getversion.json

@@ -1,24 +0,0 @@
-{
-  "branches": [
-    "main",
-    {
-      "name": "dev",
-      "prerelease": true
-    }
-  ],
-  "plugins": [
-    [
-      "@semantic-release/commit-analyzer", {
-        "releaseRules": [
-          { "type": "build", "scope": "Needs bump", "release": "patch" }
-        ]
-      }
-    ],
-    [
-      "@semantic-release/exec",
-      {
-        "verifyReleaseCmd": "echo ${nextRelease.version} > .VERSION"
-      }
-    ]
-  ]
-}

.releaserc.js

@@ -0,0 +1,84 @@
+module.exports = {
+  "branches": [
+    "main",
+    {
+      "name": "dev",
+      "prerelease": true
+    }
+  ],
+  "plugins": [
+    [
+      "@semantic-release/commit-analyzer", {
+        "releaseRules": [
+          { "type": "build", "scope": "Needs bump", "release": "patch" }
+        ]
+      }
+    ],
+    "@semantic-release/changelog",
+    [
+      "@semantic-release/release-notes-generator",
+      {
+        "preset": "conventionalcommits",
+        writerOpts: {
+          commitPartial: "* {{subject}} ([{{author.name}}]({{~@root.host}}/{{~@root.owner}}/{{~@root.repository}}/commit/{{hash}}))\n",
+          mainTemplate: `
+{{#each commitGroups}}
+{{#if title}}
+## {{title}}
+{{/if}}
+{{#each commits}}
+{{> commit root=@root}}
+{{/each}}
+{{/each}}
+          `
+        }
+      }
+    ],
+    [
+      "@droidsolutions-oss/semantic-release-update-file",
+      {
+        "files": [
+          {
+            "path": ["pubspec.yaml"],
+            "type": "flutter",
+            "branches": ["main", "dev"]
+          }
+        ]
+      }
+    ],
+    [
+      "@semantic-release/exec",
+      {
+        "prepareCmd": "flutter build apk"
+      }
+    ],
+    [
+      "@semantic-release/git",
+      {
+        "assets": [
+          "pubspec.yaml"
+        ]
+      }
+    ],
+    [
+      "@semantic-release/github",
+      {
+        "assets": [
+          {
+            "path": "build/app/outputs/apk/release/revanced-manager*.apk"
+          }
+        ],
+        "successComment": false
+      }
+    ],
+    [
+      "@saithodev/semantic-release-backmerge",
+      {
+        "backmergeBranches": [{"from": "main", "to": "dev"}],
+        "clearWorkspace": true
+      }
+    ]
+  ],
+
+
+};

.releaserc.release.json

@@ -1,46 +0,0 @@
-{
-  "branches": [
-    "main",
-    {
-      "name": "dev",
-      "prerelease": true
-    }
-  ],
-  "plugins": [
-    [
-      "@semantic-release/commit-analyzer", {
-        "releaseRules": [
-          { "type": "build", "scope": "Needs bump", "release": "patch" }
-        ]
-      }
-    ],
-    "@semantic-release/changelog",
-    "@semantic-release/release-notes-generator",
-    [
-      "@semantic-release/git",
-      {
-        "assets": [
-          "pubspec.yaml"
-        ]
-      }
-    ],
-    [
-      "@semantic-release/github",
-      {
-        "assets": [
-          {
-            "path": "revanced-manager-v*.apk"
-          }
-        ],
-        "successComment": false
-      }
-    ],
-    [
-      "@saithodev/semantic-release-backmerge",
-      {
-        "backmergeBranches": [{"from": "main", "to": "dev"}],
-        "clearWorkspace": true
-      }
-    ]
-  ]
-}

android/app/build.gradle

@@ -47,11 +47,30 @@ android {
         release {
             shrinkResources false
             minifyEnabled false
-            resValue "string", "app_name", "ReVanced Manager"
-            signingConfig signingConfigs.debug
             ndk {
                 abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86_64'
             }
+            if (System.getenv("signingKey") != null) {
+                signingConfigs {
+                    create("release") {
+                        storeFile = file(System.getenv("signingKey"))
+                        storePassword = System.getenv("keyStorePassword")
+                        keyAlias = System.getenv("keyAlias")
+                        keyPassword = System.getenv("keyPassword")
+                    }
+                }
+                signingConfig = signingConfigs.release
+                resValue "string", "app_name", "ReVanced Manager"
+                applicationVariants.all { variant ->
+                    variant.outputs.all {
+                        outputFileName = "revanced-manager-v${flutterVersionName}.apk"
+                    }
+                }
+            } else {
+                signingConfig = signingConfigs.debug
+                resValue "string", "app_name", "ReVanced Manager Debug"
+                applicationIdSuffix ".debug"
+            }
         }
         debug {
             shrinkResources false

package.json

@@ -1,9 +1,11 @@
 {
   "devDependencies": {
+    "@droidsolutions-oss/semantic-release-update-file": "^1.3.2",
     "@saithodev/semantic-release-backmerge": "^4.0.1",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/exec": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
+    "conventional-changelog-conventionalcommits": "^7.0.2",
     "semantic-release": "^22.0.12"
   }
 }