From 56c21a57e3d770e0b6dd6e5906e78dbdda831c29 Mon Sep 17 00:00:00 2001 From: Hari Date: Sun, 24 Sep 2023 16:05:07 +0530 Subject: [PATCH] ci: sync with upstream repo using git reset instead of git rebase (#157) 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 --- .github/workflows/raise-operator-pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/raise-operator-pr.yml b/.github/workflows/raise-operator-pr.yml index 2fb4d66..4a0f864 100644 --- 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 }}'