Skip to content

Commit

Permalink
Fix release workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
folmos-at-orange committed Jul 22, 2024
1 parent ba9a735 commit c89b398
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,15 @@ jobs:
fetch-depth: 0
- name: Update "main" branch
run: |-
# Set the git user
git config --global user.name "${{ github.triggering_actor }}"
git config --global user.email "[email protected]"
# Fetch the dev branch
git fetch origin dev
git switch dev # To activate the local copy
git switch main
# Merge dev into main, tag the merge commit
git merge --no-ff -m'Merge branch 'dev' for release ${{ inputs.version }}' dev
git tag ${{ inputs.version }}
Expand Down

0 comments on commit c89b398

Please sign in to comment.