-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
ba9a735
commit c89b398
Showing
1 changed file
with
9 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 }} | ||
|