ci: sync with upstream repo using git reset instead of git rebase

Rebase doesn't make sense since we simply want to sync up our old main branch with the latest main. Signed-off-by: Harikrishnan Balagopal <[email protected]>
konveyor · Sep 24, 2023 · 4b13e40 · 4b13e40
1 parent 51c1cec
commit 4b13e40
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/workflows/raise-operator-pr.yml b/.github/workflows/raise-operator-pr.yml
@@ -46,7 +46,7 @@ jobs:
           echo 'sync our fork with upstream'
           git remote add upstream https://github.com/k8s-operatorhub/community-operators
           git fetch --all
-          git rebase upstream/main
+          git reset --hard upstream/main
           echo 'copy-bundle-into-fork-creating-new-version-dir'
           cd operators/move2kube-operator/ || exit 1
           VERSION='${{ github.event.inputs.tag }}'
@@ -76,7 +76,7 @@ jobs:
           echo 'sync our fork with upstream'
           git remote add upstream https://github.com/redhat-openshift-ecosystem/community-operators-prod
           git fetch --all
-          git rebase upstream/main
+          git reset --hard upstream/main
           echo 'copy-bundle-into-fork-of-prod-repo-creating-new-version-dir'
           cd operators/move2kube-operator/ || exit 1
           VERSION='${{ github.event.inputs.tag }}'