[bazel] Rename bazel_build.go task driver to bazel_build_all.go.
This is necessary for consistency with the upcoming bazel_test_all.go task driver, which cannot be called bazel_test.go because the Go toolchain will treat it as a test, rather than as a regular Go program.
Bug: skia:11111
Change-Id: I1b35e0517b31c605dc6b2eb680d20ab7dfad2cbd
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/373762
Reviewed-by: Leandro Lovisolo <lovisolo@google.com>
Commit-Queue: Leandro Lovisolo <lovisolo@google.com>
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index eea654d..797e0dc 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -576,7 +576,7 @@
CasSpec: CAS_WHOLE_REPO,
CipdPackages: cipd,
Command: []string{
- "./bazel_build",
+ "./bazel_build_all",
"--project_id", "skia-swarming-bots",
"--task_id", specs.PLACEHOLDER_TASK_ID,
"--task_name", name,
diff --git a/infra/bots/task_drivers/bazel_build/BUILD.bazel b/infra/bots/task_drivers/bazel_build_all/BUILD.bazel
similarity index 74%
rename from infra/bots/task_drivers/bazel_build/BUILD.bazel
rename to infra/bots/task_drivers/bazel_build_all/BUILD.bazel
index cb2339f..9b12faa 100644
--- a/infra/bots/task_drivers/bazel_build/BUILD.bazel
+++ b/infra/bots/task_drivers/bazel_build_all/BUILD.bazel
@@ -1,9 +1,9 @@
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
go_library(
- name = "bazel_build_lib",
- srcs = ["bazel_build.go"],
- importpath = "go.skia.org/infra/infra/bots/task_drivers/bazel_build",
+ name = "bazel_build_all_lib",
+ srcs = ["bazel_build_all.go"],
+ importpath = "go.skia.org/infra/infra/bots/task_drivers/bazel_build_all",
visibility = ["//visibility:private"],
deps = [
"//go/exec",
@@ -16,7 +16,7 @@
)
go_binary(
- name = "bazel_build",
- embed = [":bazel_build_lib"],
+ name = "bazel_build_all",
+ embed = [":bazel_build_all_lib"],
visibility = ["//visibility:public"],
)
diff --git a/infra/bots/task_drivers/bazel_build/bazel_build.go b/infra/bots/task_drivers/bazel_build_all/bazel_build_all.go
similarity index 89%
rename from infra/bots/task_drivers/bazel_build/bazel_build.go
rename to infra/bots/task_drivers/bazel_build_all/bazel_build_all.go
index d429277..50ac70e 100644
--- a/infra/bots/task_drivers/bazel_build/bazel_build.go
+++ b/infra/bots/task_drivers/bazel_build_all/bazel_build_all.go
@@ -15,11 +15,11 @@
var (
// Required properties for this task.
- projectID = flag.String("project_id", "", "ID of the Google Cloud project.")
- taskID = flag.String("task_id", "", "ID of this task.")
- taskName = flag.String("task_name", "", "Name of the task.")
- workdir = flag.String("workdir", ".", "Working directory.")
- rbe = flag.Bool("rbe", false, "Whether to run Bazel on RBE or locally.")
+ projectID = flag.String("project_id", "", "ID of the Google Cloud project.")
+ taskID = flag.String("task_id", "", "ID of this task.")
+ taskName = flag.String("task_name", "", "Name of the task.")
+ workDirFlag = flag.String("workdir", ".", "Working directory.")
+ rbe = flag.Bool("rbe", false, "Whether to run Bazel on RBE or locally.")
// Optional flags.
local = flag.Bool("local", false, "True if running locally (as opposed to on the bots)")
@@ -34,11 +34,11 @@
defer td.EndRun(ctx)
// Compute various directory paths.
- wd, err := os_steps.Abs(ctx, *workdir)
+ workDir, err := os_steps.Abs(ctx, *workDirFlag)
if err != nil {
td.Fatal(ctx, err)
}
- repoDir := filepath.Join(wd, "buildbot") // Repository checkout.
+ repoDir := filepath.Join(workDir, "buildbot") // Repository checkout.
// Initialize a fake Git repository. We will use it to detect diffs.
//
@@ -79,7 +79,7 @@
}
// Set up go.
- ctx = golang.WithEnv(ctx, wd)
+ ctx = golang.WithEnv(ctx, workDir)
if err := golang.InstallCommonDeps(ctx, repoDir); err != nil {
td.Fatal(ctx, err)
}
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 723b332..513ee64 100755
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -850,7 +850,7 @@
}
],
"command": [
- "./bazel_build",
+ "./bazel_build_all",
"--project_id",
"skia-swarming-bots",
"--task_id",
@@ -934,7 +934,7 @@
}
],
"command": [
- "./bazel_build",
+ "./bazel_build_all",
"--project_id",
"skia-swarming-bots",
"--task_id",
