From 559018554bbeb75a565e7fadc57a1c0b74081a1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bombo?= Date: Wed, 27 Nov 2024 18:24:05 -0600 Subject: [PATCH] ci: unbreak: Reallow no-op builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #9838 previously modified the static build so as not to repeatedly copy the same assets on each matrix iteration: https://github.com/kata-containers/kata-containers/pull/9838#issuecomment-2169299202 However, that implementation breaks specifiying no-op/WIP build targets such as done in e43c59a. Such no-op builds have been a historical of the project requirement because of a GHA limitation. The breakage is due to no-op builds not generating a tar file corresponding to the asset: https://github.com/kata-containers/kata-containers/actions/runs/12059743390/job/33628926474?pr=10592 To address this breakage, we revert to the `cp -r` implementation and add the `--no-clobber` flag to still preserve the current behavior. Note that `-r` will also create the destination directory if it doesn't exist. Signed-off-by: Aurélien Bombo --- .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 b72a2d681c..db62e2b996 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 - mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. + cp -r --no-clobber "${build_dir}" "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 - mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. + cp -r --no-clobber "${build_dir}" "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 - mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. + cp -r --no-clobber "${build_dir}" "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 2291894e4c..60a11d620d 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 - mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. + cp -r --no-clobber "${build_dir}" "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 - mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. + cp -r --no-clobber "${build_dir}" "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 - mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. + cp -r --no-clobber "${build_dir}" "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 6ac723cb9e..00907130e1 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 - mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. + cp -r --no-clobber "${build_dir}" "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 - mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. + cp -r --no-clobber "${build_dir}" "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 - mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. + cp -r --no-clobber "${build_dir}" "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 72304b81ed..7b3f193aa8 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 - mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. + cp -r --no-clobber "${build_dir}" "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 - mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. + cp -r --no-clobber "${build_dir}" "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 - mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. + cp -r --no-clobber "${build_dir}" "kata-build" env: KATA_ASSET: shim-v2 TAR_OUTPUT: shim-v2.tar.gz