diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index a9bd2e2e53..b04b35ea18 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -37,9 +37,9 @@ jobs: run: mv build/app/outputs/apk/release/app-release.apk revanced-manager-${{ env.RELEASE_VERSION }}.apk - name: Publish release APK - uses: "marvinpinto/action-automatic-releases@latest" + uses: "svenstaro/upload-release-action@v2" with: repo_token: "${{ secrets.GITHUB_TOKEN }}" prerelease: ${{ env.BRANCH == 'dev' }} - automatic_release_tag: ${{ env.RELEASE_VERSION }} - files: revanced-manager-${{ env.RELEASE_VERSION }}.apk + tag: ${{ env.RELEASE_VERSION }} + file: revanced-manager-${{ env.RELEASE_VERSION }}.apk diff --git a/.releaserc b/.releaserc index 13b29fcde9..a7a3d1e271 100644 --- a/.releaserc +++ b/.releaserc @@ -35,6 +35,13 @@ "pubspec.yaml" ] } + ], + [ + "@saithodev/semantic-release-backmerge", + { + "backmergeBranches": [{"from": "main", "to": "dev"}], + "clearWorkspace": true + } ] ] } diff --git a/.releaserc.release.json b/.releaserc.release.json deleted file mode 100644 index e97a20c193..0000000000 --- a/.releaserc.release.json +++ /dev/null @@ -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": "build/app/outputs/apk/release/*.apk" - } - ], - "successComment": false - } - ], - [ - "@saithodev/semantic-release-backmerge", - { - "backmergeBranches": [{"from": "main", "to": "dev"}], - "clearWorkspace": true - } - ] - ] -} \ No newline at end of file