From d92b0fdd43a92fe823ce0af307b3d50befb1e2c1 Mon Sep 17 00:00:00 2001 From: Vidar Holen Date: Thu, 17 Jul 2025 13:42:40 -0700 Subject: [PATCH] Rename build/ to builders/ to avoid looking like build output --- {build => builders}/README.md | 0 {build => builders}/build_builder | 0 {build => builders}/darwin.aarch64/Dockerfile | 0 {build => builders}/darwin.aarch64/build | 0 {build => builders}/darwin.aarch64/tag | 0 {build => builders}/darwin.x86_64/Dockerfile | 0 {build => builders}/darwin.x86_64/build | 0 {build => builders}/darwin.x86_64/tag | 0 {build => builders}/linux.aarch64/Dockerfile | 0 {build => builders}/linux.aarch64/build | 0 {build => builders}/linux.aarch64/tag | 0 {build => builders}/linux.armv6hf/Dockerfile | 0 {build => builders}/linux.armv6hf/build | 0 {build => builders}/linux.armv6hf/cabal.project.freeze | 0 {build => builders}/linux.armv6hf/scutil | 0 {build => builders}/linux.armv6hf/tag | 0 {build => builders}/linux.riscv64/Dockerfile | 0 {build => builders}/linux.riscv64/build | 0 {build => builders}/linux.riscv64/cabal.project.freeze | 0 {build => builders}/linux.riscv64/tag | 0 {build => builders}/linux.x86_64/Dockerfile | 0 {build => builders}/linux.x86_64/build | 0 {build => builders}/linux.x86_64/tag | 0 {build => builders}/run_builder | 0 {build => builders}/windows.x86_64/Dockerfile | 0 {build => builders}/windows.x86_64/build | 0 {build => builders}/windows.x86_64/tag | 0 test/check_release | 4 ++-- 28 files changed, 2 insertions(+), 2 deletions(-) rename {build => builders}/README.md (100%) rename {build => builders}/build_builder (100%) rename {build => builders}/darwin.aarch64/Dockerfile (100%) rename {build => builders}/darwin.aarch64/build (100%) rename {build => builders}/darwin.aarch64/tag (100%) rename {build => builders}/darwin.x86_64/Dockerfile (100%) rename {build => builders}/darwin.x86_64/build (100%) rename {build => builders}/darwin.x86_64/tag (100%) rename {build => builders}/linux.aarch64/Dockerfile (100%) rename {build => builders}/linux.aarch64/build (100%) rename {build => builders}/linux.aarch64/tag (100%) rename {build => builders}/linux.armv6hf/Dockerfile (100%) rename {build => builders}/linux.armv6hf/build (100%) rename {build => builders}/linux.armv6hf/cabal.project.freeze (100%) rename {build => builders}/linux.armv6hf/scutil (100%) rename {build => builders}/linux.armv6hf/tag (100%) rename {build => builders}/linux.riscv64/Dockerfile (100%) rename {build => builders}/linux.riscv64/build (100%) rename {build => builders}/linux.riscv64/cabal.project.freeze (100%) rename {build => builders}/linux.riscv64/tag (100%) rename {build => builders}/linux.x86_64/Dockerfile (100%) rename {build => builders}/linux.x86_64/build (100%) rename {build => builders}/linux.x86_64/tag (100%) rename {build => builders}/run_builder (100%) rename {build => builders}/windows.x86_64/Dockerfile (100%) rename {build => builders}/windows.x86_64/build (100%) rename {build => builders}/windows.x86_64/tag (100%) diff --git a/build/README.md b/builders/README.md similarity index 100% rename from build/README.md rename to builders/README.md diff --git a/build/build_builder b/builders/build_builder similarity index 100% rename from build/build_builder rename to builders/build_builder diff --git a/build/darwin.aarch64/Dockerfile b/builders/darwin.aarch64/Dockerfile similarity index 100% rename from build/darwin.aarch64/Dockerfile rename to builders/darwin.aarch64/Dockerfile diff --git a/build/darwin.aarch64/build b/builders/darwin.aarch64/build similarity index 100% rename from build/darwin.aarch64/build rename to builders/darwin.aarch64/build diff --git a/build/darwin.aarch64/tag b/builders/darwin.aarch64/tag similarity index 100% rename from build/darwin.aarch64/tag rename to builders/darwin.aarch64/tag diff --git a/build/darwin.x86_64/Dockerfile b/builders/darwin.x86_64/Dockerfile similarity index 100% rename from build/darwin.x86_64/Dockerfile rename to builders/darwin.x86_64/Dockerfile diff --git a/build/darwin.x86_64/build b/builders/darwin.x86_64/build similarity index 100% rename from build/darwin.x86_64/build rename to builders/darwin.x86_64/build diff --git a/build/darwin.x86_64/tag b/builders/darwin.x86_64/tag similarity index 100% rename from build/darwin.x86_64/tag rename to builders/darwin.x86_64/tag diff --git a/build/linux.aarch64/Dockerfile b/builders/linux.aarch64/Dockerfile similarity index 100% rename from build/linux.aarch64/Dockerfile rename to builders/linux.aarch64/Dockerfile diff --git a/build/linux.aarch64/build b/builders/linux.aarch64/build similarity index 100% rename from build/linux.aarch64/build rename to builders/linux.aarch64/build diff --git a/build/linux.aarch64/tag b/builders/linux.aarch64/tag similarity index 100% rename from build/linux.aarch64/tag rename to builders/linux.aarch64/tag diff --git a/build/linux.armv6hf/Dockerfile b/builders/linux.armv6hf/Dockerfile similarity index 100% rename from build/linux.armv6hf/Dockerfile rename to builders/linux.armv6hf/Dockerfile diff --git a/build/linux.armv6hf/build b/builders/linux.armv6hf/build similarity index 100% rename from build/linux.armv6hf/build rename to builders/linux.armv6hf/build diff --git a/build/linux.armv6hf/cabal.project.freeze b/builders/linux.armv6hf/cabal.project.freeze similarity index 100% rename from build/linux.armv6hf/cabal.project.freeze rename to builders/linux.armv6hf/cabal.project.freeze diff --git a/build/linux.armv6hf/scutil b/builders/linux.armv6hf/scutil similarity index 100% rename from build/linux.armv6hf/scutil rename to builders/linux.armv6hf/scutil diff --git a/build/linux.armv6hf/tag b/builders/linux.armv6hf/tag similarity index 100% rename from build/linux.armv6hf/tag rename to builders/linux.armv6hf/tag diff --git a/build/linux.riscv64/Dockerfile b/builders/linux.riscv64/Dockerfile similarity index 100% rename from build/linux.riscv64/Dockerfile rename to builders/linux.riscv64/Dockerfile diff --git a/build/linux.riscv64/build b/builders/linux.riscv64/build similarity index 100% rename from build/linux.riscv64/build rename to builders/linux.riscv64/build diff --git a/build/linux.riscv64/cabal.project.freeze b/builders/linux.riscv64/cabal.project.freeze similarity index 100% rename from build/linux.riscv64/cabal.project.freeze rename to builders/linux.riscv64/cabal.project.freeze diff --git a/build/linux.riscv64/tag b/builders/linux.riscv64/tag similarity index 100% rename from build/linux.riscv64/tag rename to builders/linux.riscv64/tag diff --git a/build/linux.x86_64/Dockerfile b/builders/linux.x86_64/Dockerfile similarity index 100% rename from build/linux.x86_64/Dockerfile rename to builders/linux.x86_64/Dockerfile diff --git a/build/linux.x86_64/build b/builders/linux.x86_64/build similarity index 100% rename from build/linux.x86_64/build rename to builders/linux.x86_64/build diff --git a/build/linux.x86_64/tag b/builders/linux.x86_64/tag similarity index 100% rename from build/linux.x86_64/tag rename to builders/linux.x86_64/tag diff --git a/build/run_builder b/builders/run_builder similarity index 100% rename from build/run_builder rename to builders/run_builder diff --git a/build/windows.x86_64/Dockerfile b/builders/windows.x86_64/Dockerfile similarity index 100% rename from build/windows.x86_64/Dockerfile rename to builders/windows.x86_64/Dockerfile diff --git a/build/windows.x86_64/build b/builders/windows.x86_64/build similarity index 100% rename from build/windows.x86_64/build rename to builders/windows.x86_64/build diff --git a/build/windows.x86_64/tag b/builders/windows.x86_64/tag similarity index 100% rename from build/windows.x86_64/tag rename to builders/windows.x86_64/tag diff --git a/test/check_release b/test/check_release index f3ea9df..883d335 100755 --- a/test/check_release +++ b/test/check_release @@ -61,8 +61,8 @@ cat << EOF Manual Checklist $((i++)). Make sure none of the automated checks above failed -$((i++)). Run \`build/build_builder build/*/\` to update all builder images. -$((j++)). \`build/run_builder dist-newstyle/sdist/ShellCheck-*.tar.gz build/*/\` to verify that they work. +$((i++)). Run \`builders/build_builder build/*/\` to update all builder images. +$((j++)). \`builders/run_builder dist-newstyle/sdist/ShellCheck-*.tar.gz builders/*/\` to verify that they work. $((j++)). \`for f in \$(cat build/*/tag); do docker push "\$f"; done\` to upload them. $((i++)). Run test/distrotest to ensure that most distros can build OOTB. $((i++)). Make sure GitHub Build currently passes: https://github.com/koalaman/shellcheck/actions