Add rebase step

rvykydal · Jun 26, 2024 · 7b5449a · 7b5449a
1 parent 6314806
commit 7b5449a
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/.github/workflows/kickstart-tests.yml b/.github/workflows/kickstart-tests.yml
@@ -173,6 +173,15 @@ jobs:
           path: kickstart-tests
           ref: ${{ steps.get_kstest_pr.outputs.kstest_head_ref }}
 
+      - name: Rebase to the upstream kickstart-tests target
+        working-directory: ./kickstart-tests
+        run: |
+          git config user.name github-actions
+          git config user.email [email protected]
+          git remote add upstream https://github.com/rhinstaller/kickstart-tests.git
+          git log --oneline -1 upstream/${{ steps.get_kstest_pr.outputs.kstest_base_ref }}
+          git rebase upstream/${{ steps.get_kstest_pr.outputs.kstest_base_ref }}
+
       - name: Generate test cases
         working-directory: ./kickstart-tests
         run: scripts/generate-testcases.py -t ./testlib/test_cases/kstest-template.tc.yaml.j2 . -o ./testlib/test_cases