Skip to content

Commit

Permalink
chore: make the release action puth to the correct branch
Browse files Browse the repository at this point in the history
  • Loading branch information
RomanBredehoft authored and fd0r committed Oct 4, 2023
1 parent 49166e4 commit e04c75a
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@ jobs:
IS_PATCH: ${{ needs.release-checks.outputs.is_patch }}
GIT_TAG: ${{ needs.release-checks.outputs.git_tag }}
RELEASE_BRANCH_NAME: ${{ needs.release-checks.outputs.release_branch_name }}
TARGET_BRANCH_NAME: ${{ github.ref }}

steps:
- name: Import GPG
Expand All @@ -255,13 +256,15 @@ jobs:
git_user_signingkey: true
git_tag_gpgsign: true

# For non-rc and non-patch releases create the new release branch
- name: Create and push the release branch to public repository
# For non-rc and non-patch releases, create the new release branch
- name: Create the release branch
if: env.IS_RC == 'false' && env.IS_PATCH == 'false'
run: |
git lfs fetch --all
git checkout -b "${{ env.RELEASE_BRANCH_NAME }}"
echo "TARGET_BRANCH_NAME=${{ env.RELEASE_BRANCH_NAME }}" >> "$GITHUB_ENV"
# Create the tag related to the current version
- name: Create tag
run: |
Expand All @@ -273,7 +276,7 @@ jobs:
uses: ad-m/github-push-action@master
with:
github_token: ${{ secrets.BOT_TOKEN }}
branch: ${{ github.ref }}
branch: ${{ env.TARGET_BRANCH_NAME }}
tags: true

# This action creates docker and pypi images directly on the AWS EC2 instance
Expand Down

0 comments on commit e04c75a

Please sign in to comment.