Skip to content

Commit 449762e

Browse files
authored
fix workflows (#592)
1 parent 5bd1efa commit 449762e

2 files changed

Lines changed: 2 additions & 0 deletions

File tree

.github/workflows/release-project.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ jobs:
3838
3939
release_repository:
4040
name: Release repository
41+
needs: variables
4142
uses: ./.github/workflows/release-repository.yaml
4243
with:
4344
release_candidate: ${{ needs.variables.outputs.RC_BRANCH_NAME }}

.github/workflows/release-repository.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,5 +118,6 @@ jobs:
118118
- name: Update devel branch
119119
if: ${{ env.DEVEL_BRANCH != env.MAIN_BRANCH && inputs.automatic_mode }}
120120
run: |
121+
git config pull.rebase false
121122
git pull origin ${{ env.MAIN_BRANCH }}
122123
git push origin ${{ env.DEVEL_BRANCH }}

0 commit comments

Comments
 (0)