diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f3dd56faf..6af9de260 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,9 +5,11 @@ on: push: branches: - main + - dev pull_request: branches: - main + - dev jobs: release: @@ -30,7 +32,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v3 with: - node-version: 'latest' + node-version: '18' cache: 'npm' - name: Setup Android SDK uses: amyu/setup-android@v2 @@ -43,8 +45,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: ./gradlew generateMeta clean --no-daemon - name: Setup semantic-release - run: npm install semantic-release @saithodev/semantic-release-backmerge @semantic-release/git @semantic-release/changelog gradle-semantic-release-plugin -D + run: npm install - name: Release env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }} run: npm exec semantic-release diff --git a/package-lock.json b/package-lock.json index db70ebcc2..f9da8b099 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "devDependencies": { - "@saithodev/semantic-release-backmerge": "^2.1.3", + "@saithodev/semantic-release-backmerge": "^3.1.0", "@semantic-release/changelog": "^6.0.2", "@semantic-release/git": "^10.0.1", "gradle-semantic-release-plugin": "^1.7.6", @@ -314,17 +314,17 @@ } }, "node_modules/@saithodev/semantic-release-backmerge": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@saithodev/semantic-release-backmerge/-/semantic-release-backmerge-2.1.3.tgz", - "integrity": "sha512-h6QOzSU6xgZBceffJxGa9vUhH63kLixJfSMHDeKiVqRtBS/pC3tuXEVYXN2hkPylEBrieOkQwNCsTNWFkOT0Og==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@saithodev/semantic-release-backmerge/-/semantic-release-backmerge-3.1.0.tgz", + "integrity": "sha512-92AN5eI8svpxeUD6cw2JjCrHHZVlWIxQ67SiSSwoI1UP4N5QohCOf9O/W3OUApxKg3C8Y0RpGt7TUpGEwGhXhw==", "dev": true, "dependencies": { - "@semantic-release/error": "^2.2.0 || ^3.0.0", + "@semantic-release/error": "^3.0.0", "aggregate-error": "^3.1.0", "debug": "^4.3.4", "execa": "^5.1.1", "lodash": "^4.17.21", - "semantic-release": ">=13.0.0 <20" + "semantic-release": ">=20.0.0" } }, "node_modules/@semantic-release/changelog": { @@ -513,12 +513,6 @@ "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==", "dev": true }, - "node_modules/@types/parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", - "dev": true - }, "node_modules/@types/retry": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz", @@ -595,6 +589,12 @@ "integrity": "sha512-QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg==", "dev": true }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, "node_modules/argv-formatter": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/argv-formatter/-/argv-formatter-1.0.0.tgz", @@ -5548,7 +5548,7 @@ "version": "20.1.0", "resolved": "https://registry.npmjs.org/semantic-release/-/semantic-release-20.1.0.tgz", "integrity": "sha512-+9+n6RIr0Fz0F53cXrjpawxWlUg3O7/qr1jF9lrE+/v6WqwBrSWnavVHTPaf2WLerET2EngoqI0M4pahkKl6XQ==", - "peer": true, + "dev": true, "dependencies": { "@semantic-release/commit-analyzer": "^9.0.2", "@semantic-release/error": "^3.0.0", @@ -5714,9 +5714,9 @@ } }, "node_modules/semantic-release/node_modules/locate-path": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.1.1.tgz", - "integrity": "sha512-vJXaRMJgRVD3+cUZs3Mncj2mxpt5mP0EmNOsxRSZRMlbqjvxzDEOIUWXGmavo0ZC9+tNZCBLQ66reA11nbpHZg==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz", + "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==", "dev": true, "dependencies": { "p-locate": "^6.0.0" diff --git a/package.json b/package.json index 4bd085ea0..54386334e 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { "devDependencies": { - "@saithodev/semantic-release-backmerge": "^2.1.3", + "@saithodev/semantic-release-backmerge": "^3.1.0", "@semantic-release/changelog": "^6.0.2", "@semantic-release/git": "^10.0.1", "gradle-semantic-release-plugin": "^1.7.6", "semantic-release": "^20.1.0" } -} \ No newline at end of file +}