From 5cccfb1ce10730e48edec60262af3aacf1673236 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@uber.com>
Date: Fri, 10 Mar 2023 10:07:30 +0200
Subject: [PATCH] move bin/ to tools/

The directories are not that different now. Also, clean up .bazelrc
---
 .buildkite/pipeline.yml   | 2 +-
 .envrc                    | 2 +-
 .gitignore                | 2 --
 ci/lint                   | 2 +-
 {bin => tools}/buildifier | 0
 {bin => tools}/mod-tidy   | 0
 6 files changed, 3 insertions(+), 5 deletions(-)
 rename {bin => tools}/buildifier (100%)
 rename {bin => tools}/mod-tidy (100%)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index f0ff564..757157a 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -27,7 +27,7 @@ steps:
       ci/launcher-wine64
   - label: "mod-tidy and update-repos"
     command: |
-      bin/mod-tidy
+      tools/mod-tidy
       git diff --exit-code
 agents:
     - "queue=init"
diff --git a/.envrc b/.envrc
index b7942ed..b5f7e2d 100644
--- a/.envrc
+++ b/.envrc
@@ -3,5 +3,5 @@
 
 set -eu
 
-BIN_DIR="$(git rev-parse --show-toplevel)/bin"
+BIN_DIR="$(git rev-parse --show-toplevel)/tools"
 export PATH="$BIN_DIR:$PATH"
diff --git a/.gitignore b/.gitignore
index 0c77972..9cfbf7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,5 +6,3 @@
 /bazel-out
 /bazel-testlogs
 /bazel-x
-
-.custom.ci.bazelrc
diff --git a/ci/lint b/ci/lint
index 08660ed..c40ecbb 100755
--- a/ci/lint
+++ b/ci/lint
@@ -19,7 +19,7 @@ if command -v shellcheck &> /dev/null; then
 fi
 
 >&2 echo "--- buildifier :bazel:"
-bin/buildifier -r -mode check "$PWD"
+tools/buildifier -r -mode check "$PWD"
 >&2 echo -e "OK\n"
 
 >&2 echo "--- Gazelle :goat:"
diff --git a/bin/buildifier b/tools/buildifier
similarity index 100%
rename from bin/buildifier
rename to tools/buildifier
diff --git a/bin/mod-tidy b/tools/mod-tidy
similarity index 100%
rename from bin/mod-tidy
rename to tools/mod-tidy