From 8df96426efb84b8e18db3e9c25648754de91bdb6 Mon Sep 17 00:00:00 2001 From: Raul Jordan Date: Thu, 16 Sep 2021 11:22:39 -0500 Subject: [PATCH] Move Scripts Into Hack/ Directory (#9605) * ensure build * moved third party to toplevel: Co-authored-by: Preston Van Loon Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> --- .bazelrc | 2 +- DEPENDENCIES.md | 4 ++-- {scripts => hack}/README.md | 0 {scripts => hack}/check-todo.sh | 0 {scripts => hack}/check_gazelle.sh | 0 {scripts => hack}/check_visibility.sh | 0 {scripts => hack}/ci-coverage.sh | 4 ++-- {scripts => hack}/codecov.sh | 0 {scripts => hack}/common.sh | 0 {scripts => hack}/coverage.sh | 0 {scripts => hack}/interop_start.sh | 0 {scripts => hack}/mirror-ethereumapis.sh | 0 {scripts => hack}/tag-versioned-docker-images.sh | 0 {scripts => hack}/update-go-pbs.sh | 0 {scripts => hack}/update-go-ssz.sh | 0 {scripts => hack}/update-mockgen.sh | 0 {scripts => hack}/upload-github-release-asset.sh | 0 {scripts => hack}/upload_fuzzers.sh | 0 {scripts => hack}/workspace_status.sh | 0 interop.Dockerfile | 2 +- 20 files changed, 6 insertions(+), 6 deletions(-) rename {scripts => hack}/README.md (100%) rename {scripts => hack}/check-todo.sh (100%) rename {scripts => hack}/check_gazelle.sh (100%) rename {scripts => hack}/check_visibility.sh (100%) rename {scripts => hack}/ci-coverage.sh (87%) rename {scripts => hack}/codecov.sh (100%) rename {scripts => hack}/common.sh (100%) rename {scripts => hack}/coverage.sh (100%) rename {scripts => hack}/interop_start.sh (100%) rename {scripts => hack}/mirror-ethereumapis.sh (100%) rename {scripts => hack}/tag-versioned-docker-images.sh (100%) rename {scripts => hack}/update-go-pbs.sh (100%) rename {scripts => hack}/update-go-ssz.sh (100%) rename {scripts => hack}/update-mockgen.sh (100%) rename {scripts => hack}/upload-github-release-asset.sh (100%) rename {scripts => hack}/upload_fuzzers.sh (100%) rename {scripts => hack}/workspace_status.sh (100%) diff --git a/.bazelrc b/.bazelrc index 43bbf5293..47f3fcaa1 100644 --- a/.bazelrc +++ b/.bazelrc @@ -21,7 +21,7 @@ run --host_force_python=PY2 build --sandbox_default_allow_network=false # Stamp binaries with git information -build --workspace_status_command=./scripts/workspace_status.sh +build --workspace_status_command=./hack/workspace_status.sh build --stamp # Prevent PATH changes from rebuilding when switching from IDE to command line. diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md index c5a6a673d..413ca8093 100644 --- a/DEPENDENCIES.md +++ b/DEPENDENCIES.md @@ -33,8 +33,8 @@ generates SSZ marshal related code based on defined data structures. These gener also be updated and checked in as frequently. ```bash -./scripts/update-go-pbs.sh -./scripts/update-go-ssz.sh +./hack/update-go-pbs.sh +./hack/update-go-ssz.sh ``` *Recommendation: Use go build only for local development and use bazel build for production.* diff --git a/scripts/README.md b/hack/README.md similarity index 100% rename from scripts/README.md rename to hack/README.md diff --git a/scripts/check-todo.sh b/hack/check-todo.sh similarity index 100% rename from scripts/check-todo.sh rename to hack/check-todo.sh diff --git a/scripts/check_gazelle.sh b/hack/check_gazelle.sh similarity index 100% rename from scripts/check_gazelle.sh rename to hack/check_gazelle.sh diff --git a/scripts/check_visibility.sh b/hack/check_visibility.sh similarity index 100% rename from scripts/check_visibility.sh rename to hack/check_visibility.sh diff --git a/scripts/ci-coverage.sh b/hack/ci-coverage.sh similarity index 87% rename from scripts/ci-coverage.sh rename to hack/ci-coverage.sh index 4975631c7..09ba3f981 100755 --- a/scripts/ci-coverage.sh +++ b/hack/ci-coverage.sh @@ -13,7 +13,7 @@ curl https://deepsource.io/cli | sh ./bin/deepsource report --analyzer test-coverage --key go --value-file /tmp/cover.out # Provide permission to execute script. -chmod +x ./scripts/codecov.sh +chmod +x ./hack/codecov.sh # Upload to codecov (requires CODECOV_TOKEN environment variable) -./scripts/codecov.sh -s "$(./bazel.sh info bazel-testlogs)" -f '**/coverage.dat' +./hack/codecov.sh -s "$(./bazel.sh info bazel-testlogs)" -f '**/coverage.dat' diff --git a/scripts/codecov.sh b/hack/codecov.sh similarity index 100% rename from scripts/codecov.sh rename to hack/codecov.sh diff --git a/scripts/common.sh b/hack/common.sh similarity index 100% rename from scripts/common.sh rename to hack/common.sh diff --git a/scripts/coverage.sh b/hack/coverage.sh similarity index 100% rename from scripts/coverage.sh rename to hack/coverage.sh diff --git a/scripts/interop_start.sh b/hack/interop_start.sh similarity index 100% rename from scripts/interop_start.sh rename to hack/interop_start.sh diff --git a/scripts/mirror-ethereumapis.sh b/hack/mirror-ethereumapis.sh similarity index 100% rename from scripts/mirror-ethereumapis.sh rename to hack/mirror-ethereumapis.sh diff --git a/scripts/tag-versioned-docker-images.sh b/hack/tag-versioned-docker-images.sh similarity index 100% rename from scripts/tag-versioned-docker-images.sh rename to hack/tag-versioned-docker-images.sh diff --git a/scripts/update-go-pbs.sh b/hack/update-go-pbs.sh similarity index 100% rename from scripts/update-go-pbs.sh rename to hack/update-go-pbs.sh diff --git a/scripts/update-go-ssz.sh b/hack/update-go-ssz.sh similarity index 100% rename from scripts/update-go-ssz.sh rename to hack/update-go-ssz.sh diff --git a/scripts/update-mockgen.sh b/hack/update-mockgen.sh similarity index 100% rename from scripts/update-mockgen.sh rename to hack/update-mockgen.sh diff --git a/scripts/upload-github-release-asset.sh b/hack/upload-github-release-asset.sh similarity index 100% rename from scripts/upload-github-release-asset.sh rename to hack/upload-github-release-asset.sh diff --git a/scripts/upload_fuzzers.sh b/hack/upload_fuzzers.sh similarity index 100% rename from scripts/upload_fuzzers.sh rename to hack/upload_fuzzers.sh diff --git a/scripts/workspace_status.sh b/hack/workspace_status.sh similarity index 100% rename from scripts/workspace_status.sh rename to hack/workspace_status.sh diff --git a/interop.Dockerfile b/interop.Dockerfile index 226321a96..fef3122ab 100644 --- a/interop.Dockerfile +++ b/interop.Dockerfile @@ -19,6 +19,6 @@ COPY --from=builder /workspace/bazel-bin/tools/interop/convert-keys/linux_amd64_ RUN mkdir /launch -COPY scripts/interop_start.sh /launch/start.sh +COPY hack/interop_start.sh /launch/start.sh ENTRYPOINT ["start.sh"]