Skip to content

Commit

Permalink
Moving the steps to merge release branch to main at the end
Browse files Browse the repository at this point in the history
Signed-off-by: cmoulliard <cmoulliard@redhat.com>
  • Loading branch information
cmoulliard committed Sep 21, 2023
1 parent 3f63fae commit cb3da10
Showing 1 changed file with 5 additions and 11 deletions.
16 changes: 5 additions & 11 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,6 @@ jobs:
git push origin release/${TAG_VERSION}
git tag v${TAG_VERSION}
git checkout main
git pull
git merge release/${TAG_VERSION}
git push origin main
git status
#git push origin release/v${TAG_VERSION}
echo "TAG_VERSION=${TAG_VERSION}" >> "${GITHUB_OUTPUT}"
- name: Login to Quay.io Hub
Expand All @@ -83,6 +73,10 @@ jobs:
env:
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

- name: Deleting the releasing branch
- name: Push back the release branch and delete it
run: |
git checkout main
git pull
git merge release/${TAG_VERSION}
git push origin main
git push origin --delete release/${{ steps.tag-chart.outputs.TAG_VERSION }}

0 comments on commit cb3da10

Please sign in to comment.