Skip to content

Commit a14d1c3

Browse files
committed
fix(bundle): Use force when pushing operatorhub bundle branch
Signed-off-by: Mat Kowalski <[email protected]>
1 parent 6701c90 commit a14d1c3

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/workflows/publish-operatorhub-on-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ jobs:
114114
git checkout -b "$BRANCH_NAME"
115115
git add operators/${{ env.OPERATOR_NAME }}/${{ steps.version.outputs.version }}
116116
git commit -m "operator ${{ env.OPERATOR_NAME }} (${{ steps.version.outputs.version }})"
117-
git push "https://github.com/${{ github.event.inputs.community_operators_midstream_repo_org }}/community-operators.git" "$BRANCH_NAME"
117+
git push --force "https://github.com/${{ github.event.inputs.community_operators_midstream_repo_org }}/community-operators.git" "$BRANCH_NAME"
118118
echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV
119119
120120
- name: Create Pull Request to community-operators
@@ -245,7 +245,7 @@ jobs:
245245
git checkout -b "$BRANCH_NAME"
246246
git add operators/${{ env.OPERATOR_NAME }}/${{ steps.version.outputs.version }}
247247
git commit -m "operator ${{ env.OPERATOR_NAME }} (${{ steps.version.outputs.version }})"
248-
git push "https://github.com/${{ github.event.inputs.community_operators_midstream_repo_org }}/community-operators.git" "$BRANCH_NAME"
248+
git push --force "https://github.com/${{ github.event.inputs.community_operators_midstream_repo_org }}/community-operators.git" "$BRANCH_NAME"
249249
echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV
250250
251251
- name: Create Pull Request to community-operators-prod

.github/workflows/publish-operatorhub.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ jobs:
132132
if: ${{ github.event.inputs.create_pr == 'true' }}
133133
working-directory: operatorhub-repo
134134
run: |
135-
git push "https://github.com/${{ github.event.inputs.community_operators_midstream_repo_org }}/community-operators.git" "${{ env.BRANCH_NAME }}"
135+
git push --force "https://github.com/${{ github.event.inputs.community_operators_midstream_repo_org }}/community-operators.git" "${{ env.BRANCH_NAME }}"
136136
137137
- name: Create Pull Request
138138
if: ${{ github.event.inputs.create_pr == 'true' }}

0 commit comments

Comments
 (0)