Module: Mesa Branch: main Commit: e1935daa195c4de9e7f23c44875d0b096865e270 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e1935daa195c4de9e7f23c44875d0b096865e270
Author: Eric Engestrom <e...@igalia.com> Date: Wed Jan 3 23:22:35 2024 +0000 ci: convert several `find | xargs` to `find -exec` Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26896> --- .gitlab-ci/container/build-deqp.sh | 3 +-- .gitlab-ci/container/build-piglit.sh | 10 +++++----- .gitlab-ci/container/debian/android_build.sh | 6 +++++- .gitlab-ci/image-tags.yml | 10 +++++----- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh index ab538ed0063..c070f8670df 100644 --- a/.gitlab-ci/container/build-deqp.sh +++ b/.gitlab-ci/container/build-deqp.sh @@ -148,8 +148,7 @@ rm -rf /deqp/external/openglcts/modules/cts-runner rm -rf /deqp/modules/internal rm -rf /deqp/execserver rm -rf /deqp/framework -# shellcheck disable=SC2038,SC2185 # TODO: rewrite find -find -iname '*cmake*' -o -name '*ninja*' -o -name '*.o' -o -name '*.a' | xargs rm -rf +find . -depth \( -iname '*cmake*' -o -name '*ninja*' -o -name '*.o' -o -name '*.a' \) -exec rm -rf {} \; ${STRIP_CMD:-strip} external/vulkancts/modules/vulkan/deqp-vk ${STRIP_CMD:-strip} external/openglcts/modules/glcts ${STRIP_CMD:-strip} modules/*/deqp-* diff --git a/.gitlab-ci/container/build-piglit.sh b/.gitlab-ci/container/build-piglit.sh index 5ab19055290..8558458456e 100644 --- a/.gitlab-ci/container/build-piglit.sh +++ b/.gitlab-ci/container/build-piglit.sh @@ -16,18 +16,18 @@ git checkout "$REV" patch -p1 <$OLDPWD/.gitlab-ci/piglit/disable-vs_in.diff cmake -S . -B . -G Ninja -DCMAKE_BUILD_TYPE=Release $PIGLIT_OPTS $EXTRA_CMAKE_ARGS ninja $PIGLIT_BUILD_TARGETS -# shellcheck disable=SC2038,SC2185 # TODO: rewrite find -find -name .git -o -name '*ninja*' -o -iname '*cmake*' -o -name '*.[chao]' | xargs rm -rf +find . -depth \( -name .git -o -name '*ninja*' -o -iname '*cmake*' -o -name '*.[chao]' \) -exec rm -rf {} \; rm -rf target_api if [ "$PIGLIT_BUILD_TARGETS" = "piglit_replayer" ]; then - # shellcheck disable=SC2038,SC2185 # TODO: rewrite find - find ! -regex "^\.$" \ + find . -depth \ + ! -regex "^\.$" \ ! -regex "^\.\/piglit.*" \ ! -regex "^\.\/framework.*" \ ! -regex "^\.\/bin$" \ ! -regex "^\.\/bin\/replayer\.py" \ ! -regex "^\.\/templates.*" \ ! -regex "^\.\/tests$" \ - ! -regex "^\.\/tests\/replay\.py" 2>/dev/null | xargs rm -rf + ! -regex "^\.\/tests\/replay\.py" \ + -exec rm -rf {} \; 2>/dev/null fi popd diff --git a/.gitlab-ci/container/debian/android_build.sh b/.gitlab-ci/container/debian/android_build.sh index 25754d92b00..338efcca8bc 100644 --- a/.gitlab-ci/container/debian/android_build.sh +++ b/.gitlab-ci/container/debian/android_build.sh @@ -1,6 +1,10 @@ #!/usr/bin/env bash # shellcheck disable=SC2086 # we want word splitting +# When changing this file, you need to bump the following +# .gitlab-ci/image-tags.yml tags: +# DEBIAN_BUILD_TAG + set -ex EPHEMERAL=( @@ -21,7 +25,7 @@ rm $ndk.zip # duplicate files. Turn them into hardlinks to save on container space. rdfind -makehardlinks true -makeresultsfile false /${ndk}/ # Drop some large tools we won't use in this build. -find /${ndk}/ -type f | grep -E -i "clang-check|clang-tidy|lldb" | xargs rm -f +find /${ndk}/ -type f \( -iname '*clang-check*' -o -iname '*clang-tidy*' -o -iname '*lldb*' \) -exec rm -f {} \; sh .gitlab-ci/container/create-android-ndk-pc.sh /$ndk zlib.pc "" "-lz" "1.2.3" $ANDROID_SDK_VERSION diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index c3ba91875ce..0c693bb799e 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -10,7 +10,7 @@ variables: DEBIAN_BASE_TAG: "2024-01-10-deb-fix" DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" - DEBIAN_BUILD_TAG: "2023-12-27-libdrm" + DEBIAN_BUILD_TAG: "2024-01-04-find" DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base" @@ -18,14 +18,14 @@ variables: DEBIAN_X86_64_TEST_IMAGE_VK_PATH: "debian/x86_64_test-vk" DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android" - DEBIAN_X86_64_TEST_ANDROID_TAG: "2023-12-22-vkcts" - DEBIAN_X86_64_TEST_GL_TAG: "2023-12-22-vkcts" - DEBIAN_X86_64_TEST_VK_TAG: "2023-12-22-vkcts" + DEBIAN_X86_64_TEST_ANDROID_TAG: "2024-01-04-find" + DEBIAN_X86_64_TEST_GL_TAG: "2024-01-04-find" + DEBIAN_X86_64_TEST_VK_TAG: "2024-01-04-find" ALPINE_X86_64_BUILD_TAG: "2023-01-07-libdrm2_4_119" ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version" FEDORA_X86_64_BUILD_TAG: "2024-01-06-libdrm" - KERNEL_ROOTFS_TAG: "2024-01-10-libdrm" + KERNEL_ROOTFS_TAG: "2024-01-10-find" KERNEL_TAG: "v6.6.4-for-mesa-ci-e4f4c500f7fb" KERNEL_REPO: "gfx-ci/linux" PKG_REPO_REV: "67f2c46b"
