diff --git a/.github/workflows/patch-build.yaml b/.github/workflows/patch-build.yaml index 0e151c51f..c6ef462c1 100644 --- a/.github/workflows/patch-build.yaml +++ b/.github/workflows/patch-build.yaml @@ -146,18 +146,8 @@ jobs: destination_branch: "main" pr_title: "Updated patch build from main ${{ env.HEAD_COMMIT_ID }}" pr_body: | - This PR updates the Helm chart version after building the patch from ${{ env.HEAD_COMMIT_ID }}. - - - name: Set Remote with GITHUB_TOKEN - run: | - git config --unset http.https://github.com/.extraheader - git remote set-url origin https://x-access-token:${{ secrets.ACTIONS_COMMMIT_TOKEN }}@github.com/${{ github.repository }}.git - - name: Push ${{ secrets.ACTIONS_COMMMIT_TOKEN }} branch to tag - run: | - git fetch --tags - git checkout main - echo git push origin $BRANCH_NAME:refs/tags/$(git tag --list 'v[0-9]*' --sort=-v:refname | head -n 1) --force - git push origin $BRANCH_NAME:refs/tags/$(git tag --list 'v[0-9]*' --sort=-v:refname | head -n 1) --force + This PR updates the Helm chart version after building the patch from $HEAD_COMMIT_ID. + Once this PR is merged, tag update job will run automatically. # - name: Debug Job # if: ${{ failure() }} diff --git a/.github/workflows/update-tag.yaml b/.github/workflows/update-tag.yaml index ec683c5a7..edbeaa4e4 100644 --- a/.github/workflows/update-tag.yaml +++ b/.github/workflows/update-tag.yaml @@ -1,21 +1,15 @@ on: - workflow_dispatch: - inputs: - services: - description: "This action will update the latest tag with current main branch HEAD. Should I proceed ? true/false" - required: true - default: "false" - push: + pull_request: + types: [closed] branches: - main - name: Release tag update --force jobs: deploy: name: Build Patch from main runs-on: ubuntu-latest - if: ${{ github.event_name == 'push' || github.event.inputs.services == 'true' }} + if: ${{ (github.event_name == 'pull_request' && github.event.pull_request.merged == true) || github.event.inputs.services == 'true' }} steps: - name: Checkout uses: actions/checkout@v2