-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fetch and checkout release branch by git fetch
- Loading branch information
1 parent
7488fe6
commit 7baadc8
Showing
1 changed file
with
8 additions
and
12 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 |
---|---|---|
|
@@ -27,12 +27,10 @@ jobs: | |
with: | ||
ref: master | ||
fetch-depth: 0 # Fetch all history to avoid shallow clone issues | ||
- name: Checkout release branch | ||
uses: actions/checkout@v4 | ||
with: | ||
# ref: ${{ github.ref }} # Checkout the release branch that triggered the workflow | ||
ref: ${{ github.event.inputs.release_branch }} # Checkout the release branch specified in the workflow dispatch input | ||
path: release_branch | ||
- name: Fetch and checkout release branch | ||
run: | | ||
git fetch origin ${{ github.event.inputs.release_branch }}:release_branch | ||
git checkout release_branch | ||
- name: Check for merge conflicts | ||
run: | | ||
git fetch origin master | ||
|
@@ -112,12 +110,10 @@ jobs: | |
with: | ||
ref: master | ||
fetch-depth: 0 # Fetch all history to avoid shallow clone issues | ||
- name: Checkout release branch | ||
uses: actions/[email protected] | ||
with: | ||
# ref: ${{ github.ref }} # Checkout the release branch that triggered the workflow | ||
ref: ${{ github.event.inputs.release_branch }} # Checkout the release branch specified in the workflow dispatch input | ||
path: release_branch | ||
- name: Fetch and checkout release branch | ||
run: | | ||
git fetch origin ${{ github.event.inputs.release_branch }}:release_branch | ||
git checkout release_branch | ||
- name: Merge release branch into master | ||
run: | | ||
git config --global user.email "[email protected]" | ||
|