From 92b8091f628647d212fd5a07fc21fb652700fe61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Thu, 28 Nov 2024 12:01:42 +0100 Subject: [PATCH] Revert "ci: unbreak: Reallow no-op builds" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 559018554bbeb75a565e7fadc57a1c0b74081a1b. As we've noticed that this is causing issues with initrd builds in the CI. Signed-off-by: Fabiano Fidêncio --- .github/workflows/build-kata-static-tarball-amd64.yaml | 6 +++--- .github/workflows/build-kata-static-tarball-arm64.yaml | 6 +++--- .github/workflows/build-kata-static-tarball-ppc64le.yaml | 6 +++--- .github/workflows/build-kata-static-tarball-s390x.yaml | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-kata-static-tarball-amd64.yaml b/.github/workflows/build-kata-static-tarball-amd64.yaml index db62e2b996..b72a2d681c 100644 --- a/.github/workflows/build-kata-static-tarball-amd64.yaml +++ b/.github/workflows/build-kata-static-tarball-amd64.yaml @@ -89,7 +89,7 @@ jobs: make "${KATA_ASSET}-tarball" build_dir=$(readlink -f build) # store-artifact does not work with symlink - cp -r --no-clobber "${build_dir}" "kata-build" + mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. env: KATA_ASSET: ${{ matrix.asset }} TAR_OUTPUT: ${{ matrix.asset }}.tar.gz @@ -181,7 +181,7 @@ jobs: make "${KATA_ASSET}-tarball" build_dir=$(readlink -f build) # store-artifact does not work with symlink - cp -r --no-clobber "${build_dir}" "kata-build" + mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. env: KATA_ASSET: ${{ matrix.asset }} TAR_OUTPUT: ${{ matrix.asset }}.tar.gz @@ -252,7 +252,7 @@ jobs: make "${KATA_ASSET}-tarball" build_dir=$(readlink -f build) # store-artifact does not work with symlink - cp -r --no-clobber "${build_dir}" "kata-build" + mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. env: KATA_ASSET: shim-v2 TAR_OUTPUT: shim-v2.tar.gz diff --git a/.github/workflows/build-kata-static-tarball-arm64.yaml b/.github/workflows/build-kata-static-tarball-arm64.yaml index 60a11d620d..2291894e4c 100644 --- a/.github/workflows/build-kata-static-tarball-arm64.yaml +++ b/.github/workflows/build-kata-static-tarball-arm64.yaml @@ -61,7 +61,7 @@ jobs: make "${KATA_ASSET}-tarball" build_dir=$(readlink -f build) # store-artifact does not work with symlink - cp -r --no-clobber "${build_dir}" "kata-build" + mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. env: KATA_ASSET: ${{ matrix.asset }} TAR_OUTPUT: ${{ matrix.asset }}.tar.gz @@ -121,7 +121,7 @@ jobs: make "${KATA_ASSET}-tarball" build_dir=$(readlink -f build) # store-artifact does not work with symlink - cp -r --no-clobber "${build_dir}" "kata-build" + mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. env: KATA_ASSET: ${{ matrix.asset }} TAR_OUTPUT: ${{ matrix.asset }}.tar.gz @@ -189,7 +189,7 @@ jobs: make "${KATA_ASSET}-tarball" build_dir=$(readlink -f build) # store-artifact does not work with symlink - cp -r --no-clobber "${build_dir}" "kata-build" + mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. env: KATA_ASSET: shim-v2 TAR_OUTPUT: shim-v2.tar.gz diff --git a/.github/workflows/build-kata-static-tarball-ppc64le.yaml b/.github/workflows/build-kata-static-tarball-ppc64le.yaml index 00907130e1..6ac723cb9e 100644 --- a/.github/workflows/build-kata-static-tarball-ppc64le.yaml +++ b/.github/workflows/build-kata-static-tarball-ppc64le.yaml @@ -63,7 +63,7 @@ jobs: make "${KATA_ASSET}-tarball" build_dir=$(readlink -f build) # store-artifact does not work with symlink - cp -r --no-clobber "${build_dir}" "kata-build" + mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. env: KATA_ASSET: ${{ matrix.asset }} TAR_OUTPUT: ${{ matrix.asset }}.tar.gz @@ -129,7 +129,7 @@ jobs: make "${KATA_ASSET}-tarball" build_dir=$(readlink -f build) # store-artifact does not work with symlink - cp -r --no-clobber "${build_dir}" "kata-build" + mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. env: KATA_ASSET: ${{ matrix.asset }} TAR_OUTPUT: ${{ matrix.asset }}.tar.gz @@ -202,7 +202,7 @@ jobs: make "${KATA_ASSET}-tarball" build_dir=$(readlink -f build) # store-artifact does not work with symlink - cp -r --no-clobber "${build_dir}" "kata-build" + mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. env: KATA_ASSET: shim-v2 TAR_OUTPUT: shim-v2.tar.gz diff --git a/.github/workflows/build-kata-static-tarball-s390x.yaml b/.github/workflows/build-kata-static-tarball-s390x.yaml index 7b3f193aa8..72304b81ed 100644 --- a/.github/workflows/build-kata-static-tarball-s390x.yaml +++ b/.github/workflows/build-kata-static-tarball-s390x.yaml @@ -67,7 +67,7 @@ jobs: make "${KATA_ASSET}-tarball" build_dir=$(readlink -f build) # store-artifact does not work with symlink - cp -r --no-clobber "${build_dir}" "kata-build" + mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. env: KATA_ASSET: ${{ matrix.asset }} TAR_OUTPUT: ${{ matrix.asset }}.tar.gz @@ -153,7 +153,7 @@ jobs: make "${KATA_ASSET}-tarball" build_dir=$(readlink -f build) # store-artifact does not work with symlink - cp -r --no-clobber "${build_dir}" "kata-build" + mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. env: KATA_ASSET: ${{ matrix.asset }} TAR_OUTPUT: ${{ matrix.asset }}.tar.gz @@ -268,7 +268,7 @@ jobs: make "${KATA_ASSET}-tarball" build_dir=$(readlink -f build) # store-artifact does not work with symlink - cp -r --no-clobber "${build_dir}" "kata-build" + mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. env: KATA_ASSET: shim-v2 TAR_OUTPUT: shim-v2.tar.gz