diff --git a/.github/workflows/cd_release.yml b/.github/workflows/cd_release.yml index cdc023c5..094b2f3c 100644 --- a/.github/workflows/cd_release.yml +++ b/.github/workflows/cd_release.yml @@ -14,7 +14,7 @@ env: jobs: update_version: name: Update the version - if: github.repository_owner == 'EMMC-ASBL' + if: github.repository_owner == 'EMMC-ASBL' && !startsWith(github.event.head_commit.message, '[bot]') runs-on: ubuntu-latest outputs: continue_workflow: ${{ steps.update_version_step.outputs.continue_workflow }} @@ -27,6 +27,7 @@ jobs: uses: actions/checkout@v6 with: fetch-depth: 0 + token: ${{ secrets.RELEASE_PAT }} - name: Set up git config run: | @@ -74,13 +75,7 @@ jobs: - name: Update '${{ env.DEFAULT_REPO_BRANCH }}' if: steps.update_version_step.outputs.continue_workflow == 'true' - uses: CasperWA/push-protected@v2 - with: - token: ${{ secrets.RELEASE_PAT }} - branch: ${{ env.DEFAULT_REPO_BRANCH }} - pre_sleep: 15 - force: false - unprotect_reviews: true + run: git push origin ${{ env.DEFAULT_REPO_BRANCH }} publish_container_image: name: Publish Container image on GH Packages diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index a1e9f153..36408b9d 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -5,7 +5,6 @@ on: push: branches: - 'master' - - 'push-action/**' # Allow pushing to protected branches (using CasperWA/push-protected) jobs: pre-commit_audit: