From 0d96d496331606909630dee84028cde998888a97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Thu, 6 Apr 2023 18:33:31 +0200 Subject: [PATCH] Revert "gha: ci-on-push: Adjust to using workflow_run" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 3a760a157a05a38327468b92e2c3c1b30283b303. Unfortunately we have to revert the PRs related to the switch done to using `workflow_run` instead of `pull_request_target`. The reason for that being that we can only mark jobs as required if they are targetting PRs. Signed-off-by: Fabiano Fidêncio --- .github/workflows/ci-on-push.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-on-push.yaml b/.github/workflows/ci-on-push.yaml index 1093992f6..242c62c17 100644 --- a/.github/workflows/ci-on-push.yaml +++ b/.github/workflows/ci-on-push.yaml @@ -11,16 +11,16 @@ jobs: if: ${{ github.event.workflow_run.conclusion == 'success' }} uses: ./.github/workflows/build-kata-static-tarball-amd64.yaml with: - tarball-suffix: -${{ github.event.workflow_run.head_sha }} + tarball-suffix: -${{ github.event.pull_request.number}}-${{ github.event.pull_request.head.sha }} publish-kata-deploy-payload-amd64: needs: build-kata-static-tarball-amd64 uses: ./.github/workflows/publish-kata-deploy-payload-amd64.yaml with: - tarball-suffix: -${{ github.event.workflow_run.head_sha }} + tarball-suffix: -${{ github.event.pull_request.number}}-${{ github.event.pull_request.head.sha }} registry: ghcr.io repo: ${{ github.repository_owner }}/kata-deploy-ci - tag: ${{ github.event.workflow_run.head_sha }}-amd64 + tag: ${{ github.event.pull_request.number }}-${{ github.event.pull_request.head.sha }}-amd64 secrets: inherit run-k8s-tests-on-aks: @@ -29,5 +29,5 @@ jobs: with: registry: ghcr.io repo: ${{ github.repository_owner }}/kata-deploy-ci - tag: ${{ github.event.workflow_run.head_sha }}-amd64 + tag: ${{ github.event.pull_request.number }}-${{ github.event.pull_request.head.sha }}-amd64 secrets: inherit