diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index f34d6917..5f9ae2c2 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -2,20 +2,17 @@ name: Patch version, publish to Sona and create new GitHub release on: pull_request: - # TODO uncomment - # pull_request: - # types: - # - closed - # branches: - # - master - # paths-ignore: - # - ".github/**" - # workflow_dispatch: + types: + - closed + branches: + - master + paths-ignore: + - ".github/**" + workflow_dispatch: jobs: version: - # TODO uncomment - # if: github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch' + if: github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch' uses: rees46/workflow/.github/workflows/reusable-android-version.yaml@master permissions: write-all with: @@ -25,9 +22,7 @@ jobs: publish: needs: version - # TODO uncomment - # uses: rees46/workflow/.github/workflows/reusable-android-publish.yaml@master - uses: rees46/workflow/.github/workflows/reusable-android-publish.yaml@refactor/reusable-android-publish + uses: rees46/workflow/.github/workflows/reusable-android-publish.yaml@master permissions: write-all with: appId: ${{ vars.PUBLIVERSIONER_ID }} @@ -40,9 +35,7 @@ jobs: MAVEN_REPOSITORY_URL: ${{ vars.REES_MAVEN_URL }} GRADLE_VERSION: 8.8 secrets: - # TODO move to vars? - # SONATA_STAGING_PROFILE_ID: ${{ secrets.SONATA_STAGING_PROFILE_ID }} - SONATA_STAGING_PROFILE_ID: 1a52351fba7390 + SONATA_STAGING_PROFILE_ID: ${{ secrets.SONATA_STAGING_PROFILE_ID }} appSecret: ${{ secrets.PUBLIVERSIONER_SECRET }} SONATA_USERNAME: ${{ secrets.SONATA_USERNAME }} SONATA_PASSWORD: ${{ secrets.SONATA_PASSWORD }} @@ -53,9 +46,7 @@ jobs: release: needs: [publish, version] - # TODO uncomment - # uses: rees46/workflow/.github/workflows/reusable-android-release.yaml@master - uses: rees46/workflow/.github/workflows/reusable-android-release.yaml@refactor/reusable-android-publish + uses: rees46/workflow/.github/workflows/reusable-android-release.yaml@master permissions: write-all with: appId: ${{ vars.PUBLIVERSIONER_ID }}