Merge pull request #51 from rollandf/force-backport

ci: add force flag to push on PR for CI

Author: rollandf

.github/workflows/fork-ci.yaml

@@ -102,11 +102,10 @@ jobs:
 
           git checkout -b feature/update-sriov-tags-to-$DOCKER_TAG
 
-          # NOTE: ignore Chart.yaml changes because we refer to chart name in values.yaml and have hardcoded version.
-          cp -r ../sriov-network-operator-fork/deployment/sriov-network-operator-chart/crds/ deployment/network-operator/charts/sriov-network-operator/
-          cp -r ../sriov-network-operator-fork/deployment/sriov-network-operator-chart/templates/ deployment/network-operator/charts/sriov-network-operator/
-          cp  ../sriov-network-operator-fork/deployment/sriov-network-operator-chart/README.md deployment/network-operator/charts/sriov-network-operator/
-          cp  ../sriov-network-operator-fork/deployment/sriov-network-operator-chart/values.yaml deployment/network-operator/charts/sriov-network-operator/
+          rm -rf deployment/network-operator/charts/sriov-network-operator/*
+          cp -r ../sriov-network-operator-fork/deployment/sriov-network-operator-chart/* deployment/network-operator/charts/sriov-network-operator/
+          # we *don't* copy `Chart.yaml` with the files below, because network-operator's `Chart.yaml` refers to the SR-IOV chart name with a hardcoded version.
+          git checkout -- deployment/network-operator/charts/sriov-network-operator/Chart.yaml
 
           yq -i e '.SriovNetworkOperator.repository |= "${{ env.DOCKER_REGISTRY }}"' hack/release.yaml
           yq -i e '.SriovNetworkOperator.version |= "${{ env.DOCKER_TAG }}"' hack/release.yaml
@@ -120,7 +119,7 @@ jobs:
             git add deployment/network-operator/charts/sriov-network-operator
             git add -u
             git commit -sam "cicd: update SR-IOV images tags to $DOCKER_TAG in chart values"
-            git push -u origin feature/update-sriov-tags-to-$DOCKER_TAG
+            git push -f -u origin feature/update-sriov-tags-to-$DOCKER_TAG
             gh pr create \
               --repo ${{ github.repository_owner }}/network-operator \
               --base $BASE_BRANCH \