ci: rebase before running samples check

This removes the need for PR author to rebase feature branch for updated samples in target branch, if any

Signed-off-by: Saul Paredes <[email protected]>

.github/workflows/check-samples.yaml

@@ -14,6 +14,12 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v4
 
+    - name: Rebase atop of the latest target branch
+      env:
+          TARGET_BRANCH: ${{ github.event.pull_request.base.ref }}
+      run: |
+        ./tests/git-helper.sh "rebase-atop-of-the-latest-target-branch"
+
     - name: Install yq
       env:
         INSTALL_IN_GOPATH: false

tests/git-helper.sh

@@ -8,6 +8,7 @@
 set -o errexit
 set -o nounset
 set -o pipefail
+set -x
 
 function add_kata_bot_info() {
 	echo "Adding user name and email to the local git repo"
@@ -21,6 +22,7 @@ function rebase_atop_of_the_latest_target_branch() {
 		echo "Rebasing atop of the latest ${TARGET_BRANCH}"
 		# Recover from any previous rebase left halfway
 		git rebase --abort 2> /dev/null || true
+		git fetch origin ${TARGET_BRANCH}
 		git rebase origin/${TARGET_BRANCH}
 	fi
 }