From fe4247a90c57cde70cb51583eb9ca267679a8de8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Mon, 11 Sep 2023 18:46:16 +0200 Subject: [PATCH] ci: Fix target-branch usage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We missed those one as part of bd24afcf737f94481992e2d88b27e66cfae64df8. Fixes: #7414 Signed-off-by: Fabiano Fidêncio (cherry picked from commit 8509c31870566b57e1f7b38241a0a7e040d8d2a0) --- .github/workflows/ci.yaml | 2 ++ .github/workflows/publish-kata-deploy-payload-amd64.yaml | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b80a3f322e..f7358b54e5 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -22,6 +22,7 @@ jobs: with: tarball-suffix: -${{ inputs.tag }} commit-hash: ${{ inputs.commit-hash }} + target-branch: ${{ inputs.target-branch }} publish-kata-deploy-payload-amd64: needs: build-kata-static-tarball-amd64 @@ -116,6 +117,7 @@ jobs: tag: ${{ inputs.tag }}-amd64 commit-hash: ${{ inputs.commit-hash }} pr-number: ${{ inputs.pr-number }} + target-branch: ${{ inputs.target-branch }} secrets: inherit run-k8s-tests-on-sev: diff --git a/.github/workflows/publish-kata-deploy-payload-amd64.yaml b/.github/workflows/publish-kata-deploy-payload-amd64.yaml index b5ba900d85..8b15a06b58 100644 --- a/.github/workflows/publish-kata-deploy-payload-amd64.yaml +++ b/.github/workflows/publish-kata-deploy-payload-amd64.yaml @@ -25,6 +25,13 @@ jobs: - uses: actions/checkout@v3 with: ref: ${{ inputs.commit-hash }} + fetch-depth: 0 + + - name: Rebase atop of the latest target branch + run: | + ./tests/git-helper.sh "rebase-atop-of-the-latest-target-branch" + env: + TARGET_BRANCH: ${{ inputs.target-branch }} - name: get-kata-tarball uses: actions/download-artifact@v3