From bbb985362b63210663f91d9c8c7be40e6214a435 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@uber.com>
Date: Mon, 28 Jun 2021 14:00:47 +0300
Subject: [PATCH] move setup to .envrc

---
 .build.yml     | 17 +++++++----------
 build-and-file |  1 -
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/.build.yml b/.build.yml
index 5ce85d8..2a67246 100644
--- a/.build.yml
+++ b/.build.yml
@@ -9,36 +9,33 @@ environment:
 tasks:
   - setup: |
       sudo apt-get purge gcc -y && sudo apt-get autoremove -y
-      curl -L https://github.com/bazelbuild/bazelisk/releases/download/v1.9.0/bazelisk-linux-amd64 \
-        -o bazel
-      chmod +x bazel
   - test_default: |
-      cd bazel-zig-cc; ./build-and-file \
+      cd bazel-zig-cc; . .envrc; ./build-and-file \
           //test:hello | \
         grep -q "ELF 64-bit.* x86-64.* dynamically linked"
   - test_x86_64-linux-gnu: |
-      cd bazel-zig-cc; ./build-and-file \
+      cd bazel-zig-cc; . .envrc; ./build-and-file \
           --platforms @io_bazel_rules_go//go/toolchain:linux_amd64_cgo //test:hello | \
         grep -q "ELF 64-bit.* x86-64.* dynamically linked"
   - test_x86_64-linux-musl: |
-      cd bazel-zig-cc; ./build-and-file \
+      cd bazel-zig-cc; . .envrc; ./build-and-file \
           --platforms @io_bazel_rules_go//go/toolchain:linux_amd64_cgo \
           --extra_toolchains @zig_sdk//:x86_64-linux-musl_toolchain //test:hello | \
         grep -q "ELF 64-bit.* x86-64.* statically linked"
   - test_aarch64-linux-gnu: |
-      cd bazel-zig-cc; ./build-and-file \
+      cd bazel-zig-cc; . .envrc; ./build-and-file \
           --platforms @io_bazel_rules_go//go/toolchain:linux_arm64_cgo //test:hello | \
         grep -q "ELF 64-bit.* ARM aarch64.* dynamically linked"
   - test_aarch64-linux-musl: |
-      cd bazel-zig-cc; ./build-and-file \
+      cd bazel-zig-cc; . .envrc; ./build-and-file \
           --platforms @io_bazel_rules_go//go/toolchain:linux_arm64_cgo \
           --extra_toolchains @zig_sdk//:aarch64-linux-musl_toolchain //test:hello | \
         grep -q "ELF 64-bit.* ARM aarch64.* statically linked"
   - test_x86_64-macos-gnu: |
-      cd bazel-zig-cc; ./build-and-file \
+      cd bazel-zig-cc; . .envrc; ./build-and-file \
           --platforms @io_bazel_rules_go//go/toolchain:darwin_amd64_cgo //test:hello | \
         grep -q "Mach-O 64-bit x86_64 executable"
   - test_aarch64-macos-gnu: |
-      cd bazel-zig-cc; ./build-and-file \
+      cd bazel-zig-cc; . .envrc; ./build-and-file \
           --platforms @io_bazel_rules_go//go/toolchain:darwin_arm64_cgo //test:hello | \
         grep -q "Mach-O 64-bit arm64 executable"
diff --git a/build-and-file b/build-and-file
index a17a6b4..20076ce 100755
--- a/build-and-file
+++ b/build-and-file
@@ -1,6 +1,5 @@
 #!/bin/bash
 # 'bazel' binary is stored in $HOME in builds.sr.ht.
-export PATH=$PATH:$HOME
 
 # -o pipefail fails `bazel aquery ...`: it errs if it can't output to stdout.
 set -xeu