From c7ee45f7e53c2a1fac31fbc92f11505915485ddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Thu, 6 Apr 2023 18:32:06 +0200 Subject: [PATCH] Revert "gha: ci-on-push: Adapt chained jobs to workflow_run" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 7855b43062c1001de372253d33ebacaf120f24d1. 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/build-kata-static-tarball-amd64.yaml | 8 ++------ .github/workflows/build-kata-static-tarball-arm64.yaml | 8 ++------ .github/workflows/build-kata-static-tarball-s390x.yaml | 8 ++------ .github/workflows/ci-on-push.yaml | 3 --- .github/workflows/publish-kata-deploy-payload-amd64.yaml | 6 +----- .github/workflows/publish-kata-deploy-payload-arm64.yaml | 6 +----- .github/workflows/publish-kata-deploy-payload-s390x.yaml | 6 +----- .github/workflows/run-k8s-tests-on-aks.yaml | 6 +----- 8 files changed, 10 insertions(+), 41 deletions(-) diff --git a/.github/workflows/build-kata-static-tarball-amd64.yaml b/.github/workflows/build-kata-static-tarball-amd64.yaml index d2c902af2..8432e7714 100644 --- a/.github/workflows/build-kata-static-tarball-amd64.yaml +++ b/.github/workflows/build-kata-static-tarball-amd64.yaml @@ -2,10 +2,6 @@ name: CI | Build kata-static tarball for amd64 on: workflow_call: inputs: - checkout-ref: - required: false - type: string - default: ${{ github.sha }} tarball-suffix: required: false type: string @@ -33,7 +29,7 @@ jobs: steps: - uses: actions/checkout@v3 with: - ref: ${{ inputs.checkout-ref }} + ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 0 # This is needed in order to keep the commit ids history - name: Build ${{ matrix.asset }} run: | @@ -60,7 +56,7 @@ jobs: steps: - uses: actions/checkout@v3 with: - ref: ${{ inputs.checkout-ref }} + ref: ${{ github.event.pull_request.head.sha }} - name: get-artifacts uses: actions/download-artifact@v3 with: diff --git a/.github/workflows/build-kata-static-tarball-arm64.yaml b/.github/workflows/build-kata-static-tarball-arm64.yaml index a50862231..753bcf13a 100644 --- a/.github/workflows/build-kata-static-tarball-arm64.yaml +++ b/.github/workflows/build-kata-static-tarball-arm64.yaml @@ -2,10 +2,6 @@ name: CI | Build kata-static tarball for arm64 on: workflow_call: inputs: - checkout-ref: - required: false - type: string - default: ${{ github.sha }} tarball-suffix: required: false type: string @@ -37,7 +33,7 @@ jobs: - uses: actions/checkout@v3 with: - ref: ${{ inputs.checkout-ref }} + ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 0 # This is needed in order to keep the commit ids history - name: Build ${{ matrix.asset }} run: | @@ -68,7 +64,7 @@ jobs: - uses: actions/checkout@v3 with: - ref: ${{ inputs.checkout-ref }} + ref: ${{ github.event.pull_request.head.sha }} - name: get-artifacts uses: actions/download-artifact@v3 with: diff --git a/.github/workflows/build-kata-static-tarball-s390x.yaml b/.github/workflows/build-kata-static-tarball-s390x.yaml index 064ed006b..95e4a5ff5 100644 --- a/.github/workflows/build-kata-static-tarball-s390x.yaml +++ b/.github/workflows/build-kata-static-tarball-s390x.yaml @@ -2,10 +2,6 @@ name: CI | Build kata-static tarball for s390x on: workflow_call: inputs: - checkout-ref: - required: false - type: string - default: ${{ github.sha }} tarball-suffix: required: false type: string @@ -33,7 +29,7 @@ jobs: - uses: actions/checkout@v3 with: - ref: ${{ inputs.checkout-ref }} + ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 0 # This is needed in order to keep the commit ids history - name: Build ${{ matrix.asset }} run: | @@ -65,7 +61,7 @@ jobs: - uses: actions/checkout@v3 with: - ref: ${{ inputs.checkout-ref }} + ref: ${{ github.event.pull_request.head.sha }} - name: get-artifacts uses: actions/download-artifact@v3 with: diff --git a/.github/workflows/ci-on-push.yaml b/.github/workflows/ci-on-push.yaml index f2cd7e055..1093992f6 100644 --- a/.github/workflows/ci-on-push.yaml +++ b/.github/workflows/ci-on-push.yaml @@ -11,14 +11,12 @@ jobs: if: ${{ github.event.workflow_run.conclusion == 'success' }} uses: ./.github/workflows/build-kata-static-tarball-amd64.yaml with: - checkout-ref: ${{ github.event.workflow_run.head_sha }} tarball-suffix: -${{ github.event.workflow_run.head_sha }} publish-kata-deploy-payload-amd64: needs: build-kata-static-tarball-amd64 uses: ./.github/workflows/publish-kata-deploy-payload-amd64.yaml with: - checkout-ref: ${{ github.event.workflow_run.head_sha }} tarball-suffix: -${{ github.event.workflow_run.head_sha }} registry: ghcr.io repo: ${{ github.repository_owner }}/kata-deploy-ci @@ -29,7 +27,6 @@ jobs: needs: publish-kata-deploy-payload-amd64 uses: ./.github/workflows/run-k8s-tests-on-aks.yaml with: - checkout-ref: ${{ github.event.workflow_run.head_sha }} registry: ghcr.io repo: ${{ github.repository_owner }}/kata-deploy-ci tag: ${{ github.event.workflow_run.head_sha }}-amd64 diff --git a/.github/workflows/publish-kata-deploy-payload-amd64.yaml b/.github/workflows/publish-kata-deploy-payload-amd64.yaml index 697fdb433..91c7a0612 100644 --- a/.github/workflows/publish-kata-deploy-payload-amd64.yaml +++ b/.github/workflows/publish-kata-deploy-payload-amd64.yaml @@ -2,10 +2,6 @@ name: CI | Publish kata-deploy payload for amd64 on: workflow_call: inputs: - checkout-ref: - required: false - type: string - default: ${{ github.sha }} tarball-suffix: required: false type: string @@ -25,7 +21,7 @@ jobs: steps: - uses: actions/checkout@v3 with: - ref: ${{ inputs.checkout-ref }} + ref: ${{ github.event.pull_request.head.sha }} - name: get-kata-tarball uses: actions/download-artifact@v3 diff --git a/.github/workflows/publish-kata-deploy-payload-arm64.yaml b/.github/workflows/publish-kata-deploy-payload-arm64.yaml index f1de4abac..c4fd32477 100644 --- a/.github/workflows/publish-kata-deploy-payload-arm64.yaml +++ b/.github/workflows/publish-kata-deploy-payload-arm64.yaml @@ -2,10 +2,6 @@ name: CI | Publish kata-deploy payload for arm64 on: workflow_call: inputs: - checkout-ref: - required: false - type: string - default: ${{ github.sha }} tarball-suffix: required: false type: string @@ -29,7 +25,7 @@ jobs: - uses: actions/checkout@v3 with: - ref: ${{ inputs.checkout-ref }} + ref: ${{ github.event.pull_request.head.sha }} - name: get-kata-tarball uses: actions/download-artifact@v3 diff --git a/.github/workflows/publish-kata-deploy-payload-s390x.yaml b/.github/workflows/publish-kata-deploy-payload-s390x.yaml index 498b8cd98..2a0ea8071 100644 --- a/.github/workflows/publish-kata-deploy-payload-s390x.yaml +++ b/.github/workflows/publish-kata-deploy-payload-s390x.yaml @@ -2,10 +2,6 @@ name: CI | Publish kata-deploy payload for s390x on: workflow_call: inputs: - checkout-ref: - required: false - type: string - default: ${{ github.sha }} tarball-suffix: required: false type: string @@ -29,7 +25,7 @@ jobs: - uses: actions/checkout@v3 with: - ref: ${{ inputs.checkout-ref }} + ref: ${{ github.event.pull_request.head.sha }} - name: get-kata-tarball uses: actions/download-artifact@v3 diff --git a/.github/workflows/run-k8s-tests-on-aks.yaml b/.github/workflows/run-k8s-tests-on-aks.yaml index b444d8db9..715814818 100644 --- a/.github/workflows/run-k8s-tests-on-aks.yaml +++ b/.github/workflows/run-k8s-tests-on-aks.yaml @@ -2,10 +2,6 @@ name: CI | Run kubernetes tests on AKS on: workflow_call: inputs: - checkout-ref: - required: false - type: string - default: ${{ github.sha }} registry: required: true type: string @@ -34,7 +30,7 @@ jobs: - uses: actions/checkout@v3 with: - ref: ${{ inputs.checkout-ref }} + ref: ${{ github.event.pull_request.head.sha }} - name: Install `bats` run: | sudo apt-get update