From de83cd9de79226b15519e07871dcdee635d501c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Thu, 6 Jul 2023 21:46:44 +0200 Subject: [PATCH] gha: ci: Use $VAR instead of ${{ env.VAR }} MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise we'll get the following error from the workflow: ``` The workflow is not valid. .github/workflows/ci-on-push.yaml (Line: 24, Col: 20): Unrecognized named-value: 'env'. Located at position 1 within expression: env.COMMIT_HASH .github/workflows/ci-on-push.yaml (Line: 25, Col: 18): Unrecognized named-value: 'env'. Located at position 1 within expression: env.PR_NUMBER ``` Signed-off-by: Fabiano Fidêncio --- .github/workflows/ci-nightly.yaml | 6 +++--- .github/workflows/ci-on-push.yaml | 6 +++--- .github/workflows/payload-after-push.yaml | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci-nightly.yaml b/.github/workflows/ci-nightly.yaml index d3a604e50..83c3a1726 100644 --- a/.github/workflows/ci-nightly.yaml +++ b/.github/workflows/ci-nightly.yaml @@ -15,6 +15,6 @@ jobs: kata-containers-ci-on-push: uses: ./.github/workflows/ci.yaml with: - commit-hash: ${{ env.COMMIT_HASH }} - pr-number: ${{ env.PR_NUMBER }} - tag: ${{ env.PR_NUMBER }}-${{ env.COMMIT_HASH }}-nightly + commit-hash: $COMMIT_HASH + pr-number: $PR_NUMBER + tag: $PR_NUMBER-$COMMIT_HASH-nightly diff --git a/.github/workflows/ci-on-push.yaml b/.github/workflows/ci-on-push.yaml index 1b10f40f6..539829967 100644 --- a/.github/workflows/ci-on-push.yaml +++ b/.github/workflows/ci-on-push.yaml @@ -21,6 +21,6 @@ jobs: if: ${{ contains(github.event.pull_request.labels.*.name, 'ok-to-test') }} uses: ./.github/workflows/ci.yaml with: - commit-hash: ${{ env.COMMIT_HASH }} - pr-number: ${{ env.PR_NUMBER }} - tag: ${{ env.PR_NUMBER }}-${{ env.COMMIT_HASH }} + commit-hash: $COMMIT_HASH + pr-number: $PR_NUMBER + tag: $PR_NUMBER-$COMMIT_HASH diff --git a/.github/workflows/payload-after-push.yaml b/.github/workflows/payload-after-push.yaml index 31c0b70bf..fabd987b7 100644 --- a/.github/workflows/payload-after-push.yaml +++ b/.github/workflows/payload-after-push.yaml @@ -12,21 +12,21 @@ jobs: build-assets-amd64: uses: ./.github/workflows/build-kata-static-tarball-amd64.yaml with: - commit-hash: ${{ env.COMMIT_HASH }} + commit-hash: $COMMIT_HASH push-to-registry: yes secrets: inherit build-assets-arm64: uses: ./.github/workflows/build-kata-static-tarball-arm64.yaml with: - commit-hash: ${{ env.COMMIT_HASH }} + commit-hash: $COMMIT_HASH push-to-registry: yes secrets: inherit build-assets-s390x: uses: ./.github/workflows/build-kata-static-tarball-s390x.yaml with: - commit-hash: ${{ env.COMMIT_HASH }} + commit-hash: $COMMIT_HASH push-to-registry: yes secrets: inherit @@ -34,7 +34,7 @@ jobs: needs: build-assets-amd64 uses: ./.github/workflows/publish-kata-deploy-payload-amd64.yaml with: - commit-hash: ${{ env.COMMIT_HASH }} + commit-hash: $COMMIT_HASH registry: quay.io repo: kata-containers/kata-deploy-ci tag: kata-containers-amd64 @@ -44,7 +44,7 @@ jobs: needs: build-assets-arm64 uses: ./.github/workflows/publish-kata-deploy-payload-arm64.yaml with: - commit-hash: ${{ env.COMMIT_HASH }} + commit-hash: $COMMIT_HASH registry: quay.io repo: kata-containers/kata-deploy-ci tag: kata-containers-arm64 @@ -54,7 +54,7 @@ jobs: needs: build-assets-s390x uses: ./.github/workflows/publish-kata-deploy-payload-s390x.yaml with: - commit-hash: ${{ env.COMMIT_HASH }} + commit-hash: $COMMIT_HASH registry: quay.io repo: kata-containers/kata-deploy-ci tag: kata-containers-s390x