Skip to content

Commit

Permalink
Fetch and checkout release branch by git fetch
Browse files Browse the repository at this point in the history
  • Loading branch information
kirill-abblix committed Jul 10, 2024
1 parent 7488fe6 commit 7baadc8
Showing 1 changed file with 8 additions and 12 deletions.
20 changes: 8 additions & 12 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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]"
Expand Down

0 comments on commit 7baadc8

Please sign in to comment.