From 8f876dc5c65915051b708c9b7fde12580d54e0d2 Mon Sep 17 00:00:00 2001 From: Amir Omidi Date: Thu, 5 Sep 2024 01:53:15 -0400 Subject: [PATCH] Change path of differ to make go install more ergonomic --- .github/workflows/bazel-ci.yaml | 4 +-- .github/workflows/release.yml | 16 +++++----- BUILD.bazel | 55 +++++++++++++++++++++++++++++++++ cli/BUILD.bazel | 55 --------------------------------- cli/main.go => main.go | 0 5 files changed, 65 insertions(+), 65 deletions(-) delete mode 100644 cli/BUILD.bazel rename cli/main.go => main.go (100%) diff --git a/.github/workflows/bazel-ci.yaml b/.github/workflows/bazel-ci.yaml index 415ad27..ee0b81d 100644 --- a/.github/workflows/bazel-ci.yaml +++ b/.github/workflows/bazel-ci.yaml @@ -27,9 +27,9 @@ jobs: # You won't do this in your build since you will likely use a prebuilt bazel-differ binary, but we # need to bootstrap - name: build - run: bazel build //cli:bazel-differ + run: bazel build //:bazel-differ - name: set bazel differ path - run: echo "BAZEL_DIFFER=$(bazel info bazel-bin)/cli/bazel-differ_/bazel-differ" >> $GITHUB_ENV + run: echo "BAZEL_DIFFER=$(bazel info bazel-bin)/bazel-differ_/bazel-differ" >> $GITHUB_ENV # This section starts an example of how to use get-targets in your CI process - name: Get revisions id: get-revisions diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 85e79a1..6e4f8c9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,13 +15,13 @@ jobs: - name: build amd64 run: | set -eu - bazelisk build //cli:bazel-differ-linux-amd64 - bazelisk run --run_under "cp -f " //cli:bazel-differ-linux-amd64 $(pwd)/bazel-differ-linux-amd64 + bazelisk build //:bazel-differ-linux-amd64 + bazelisk run --run_under "cp -f " //:bazel-differ-linux-amd64 $(pwd)/bazel-differ-linux-amd64 - name: build arm64 run: | set -eu - bazelisk build //cli:bazel-differ-linux-arm64 - bazelisk run --run_under "cp -f " //cli:bazel-differ-linux-arm64 $(pwd)/bazel-differ-linux-arm64 + bazelisk build //:bazel-differ-linux-arm64 + bazelisk run --run_under "cp -f " //:bazel-differ-linux-arm64 $(pwd)/bazel-differ-linux-arm64 - name: get release URL id: get_release uses: bruceadams/get-release@v1.2.2 @@ -60,13 +60,13 @@ jobs: - name: build amd64 run: | set -eu - bazelisk build //cli:bazel-differ-darwin-amd64 - bazelisk run --run_under "cp -f " //cli:bazel-differ-darwin-amd64 $(pwd)/bazel-differ-darwin-amd64 + bazelisk build //:bazel-differ-darwin-amd64 + bazelisk run --run_under "cp -f " //:bazel-differ-darwin-amd64 $(pwd)/bazel-differ-darwin-amd64 - name: build arm64 run: | set -eu - bazelisk build //cli:bazel-differ-darwin-arm64 - bazelisk run --run_under "cp -f " //cli:bazel-differ-darwin-arm64 $(pwd)/bazel-differ-darwin-arm64 + bazelisk build //:bazel-differ-darwin-arm64 + bazelisk run --run_under "cp -f " //:bazel-differ-darwin-arm64 $(pwd)/bazel-differ-darwin-arm64 - name: get release URL id: get_release uses: bruceadams/get-release@v1.2.2 diff --git a/BUILD.bazel b/BUILD.bazel index b34a9d6..47087ab 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -1,6 +1,7 @@ # gazelle:prefix github.com/ewhauser/bazel-differ # gazelle:exclude sql load("@bazel_gazelle//:def.bzl", "gazelle") +load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library") gazelle( name = "gazelle", @@ -44,3 +45,57 @@ sh_binary( no_match_error = "Buildozer does not have a binary for your platform", ), ) + +go_binary( + name = "bazel-differ", + embed = [":cli_lib"], + visibility = ["//visibility:public"], +) + +go_binary( + name = "bazel-differ-linux-amd64", + embed = [":cli_lib"], + goarch = "amd64", + goos = "linux", + pure = "on", + static = "on", + visibility = ["//visibility:public"], +) + +go_binary( + name = "bazel-differ-linux-arm64", + embed = [":cli_lib"], + goarch = "arm64", + goos = "linux", + pure = "on", + static = "on", + visibility = ["//visibility:public"], +) + +go_binary( + name = "bazel-differ-darwin-amd64", + embed = [":cli_lib"], + goarch = "amd64", + goos = "darwin", + pure = "on", + static = "on", + visibility = ["//visibility:public"], +) + +go_binary( + name = "bazel-differ-darwin-arm64", + embed = [":cli_lib"], + goarch = "arm64", + goos = "darwin", + pure = "on", + static = "on", + visibility = ["//visibility:public"], +) + +go_library( + name = "cli_lib", + srcs = ["main.go"], + importpath = "github.com/ewhauser/bazel-differ/cli", + visibility = ["//visibility:private"], + deps = ["//cmd"], +) diff --git a/cli/BUILD.bazel b/cli/BUILD.bazel deleted file mode 100644 index 5bc8a94..0000000 --- a/cli/BUILD.bazel +++ /dev/null @@ -1,55 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library") - -go_binary( - name = "bazel-differ", - embed = [":cli_lib"], - visibility = ["//visibility:public"], -) - -go_binary( - name = "bazel-differ-linux-amd64", - embed = [":cli_lib"], - goarch = "amd64", - goos = "linux", - pure = "on", - static = "on", - visibility = ["//visibility:public"], -) - -go_binary( - name = "bazel-differ-linux-arm64", - embed = [":cli_lib"], - goarch = "arm64", - goos = "linux", - pure = "on", - static = "on", - visibility = ["//visibility:public"], -) - -go_binary( - name = "bazel-differ-darwin-amd64", - embed = [":cli_lib"], - goarch = "amd64", - goos = "darwin", - pure = "on", - static = "on", - visibility = ["//visibility:public"], -) - -go_binary( - name = "bazel-differ-darwin-arm64", - embed = [":cli_lib"], - goarch = "arm64", - goos = "darwin", - pure = "on", - static = "on", - visibility = ["//visibility:public"], -) - -go_library( - name = "cli_lib", - srcs = ["main.go"], - importpath = "github.com/ewhauser/bazel-differ/cli", - visibility = ["//visibility:private"], - deps = ["//cmd"], -) diff --git a/cli/main.go b/main.go similarity index 100% rename from cli/main.go rename to main.go