From 40d536afb721e8fa39c8c8160b13e27c38934e28 Mon Sep 17 00:00:00 2001 From: "Daniel P. Purkhus" Date: Fri, 17 Nov 2023 10:56:39 +0000 Subject: [PATCH] Fix e2e on RBE --- WORKSPACE.bzlmod | 2 ++ e2e/net6.0/MODULE.bazel | 4 ++++ e2e/net6.0/WORKSPACE.bzlmod | 20 ++++++++++++++++++++ e2e/net7.0/MODULE.bazel | 4 ++++ e2e/net7.0/WORKSPACE.bzlmod | 20 ++++++++++++++++++++ e2e/net8.0/MODULE.bazel | 4 ++++ e2e/net8.0/WORKSPACE.bzlmod | 20 ++++++++++++++++++++ e2e/smoke/MODULE.bazel | 4 ++++ e2e/smoke/WORKSPACE.bzlmod | 20 ++++++++++++++++++++ 9 files changed, 98 insertions(+) create mode 100644 e2e/net6.0/WORKSPACE.bzlmod create mode 100644 e2e/net7.0/WORKSPACE.bzlmod create mode 100644 e2e/net8.0/WORKSPACE.bzlmod create mode 100644 e2e/smoke/WORKSPACE.bzlmod diff --git a/WORKSPACE.bzlmod b/WORKSPACE.bzlmod index 6b1d731b..8985b571 100644 --- a/WORKSPACE.bzlmod +++ b/WORKSPACE.bzlmod @@ -1,3 +1,5 @@ +# NOTE: This file is only needed to get the Bazel CI RBE working + load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( diff --git a/e2e/net6.0/MODULE.bazel b/e2e/net6.0/MODULE.bazel index 4e18c652..72869f7f 100644 --- a/e2e/net6.0/MODULE.bazel +++ b/e2e/net6.0/MODULE.bazel @@ -20,3 +20,7 @@ register_toolchains("@dotnet_toolchains//:all") main_extension = use_extension("//:paket.main_extension.bzl", "main_extension") use_repo(main_extension, "paket.main") + +# This is only required because rules_cc is required for the Bazel CI RBE config +# If you are using the e2e tests as an example for your own project, you can remove this +bazel_dep(name = "rules_cc", version = "0.0.9", dev_dependency = True) diff --git a/e2e/net6.0/WORKSPACE.bzlmod b/e2e/net6.0/WORKSPACE.bzlmod new file mode 100644 index 00000000..8985b571 --- /dev/null +++ b/e2e/net6.0/WORKSPACE.bzlmod @@ -0,0 +1,20 @@ +# NOTE: This file is only needed to get the Bazel CI RBE working + +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") + +http_archive( + name = "bazelci_rules", + sha256 = "eca21884e6f66a88c358e580fd67a6b148d30ab57b1680f62a96c00f9bc6a07e", + strip_prefix = "bazelci_rules-1.0.0", + url = "https://github.com/bazelbuild/continuous-integration/releases/download/rules-1.0.0/bazelci_rules-1.0.0.tar.gz", +) + +load("@bazelci_rules//:rbe_repo.bzl", "rbe_preconfig") + +# Creates a default toolchain config for RBE. +# Use this as is if you are using the rbe_ubuntu16_04 container, +# otherwise refer to RBE docs. +rbe_preconfig( + name = "buildkite_config", + toolchain = "ubuntu1804-bazel-java11", +) diff --git a/e2e/net7.0/MODULE.bazel b/e2e/net7.0/MODULE.bazel index 75ee7696..75c9d07e 100644 --- a/e2e/net7.0/MODULE.bazel +++ b/e2e/net7.0/MODULE.bazel @@ -20,3 +20,7 @@ register_toolchains("@dotnet_toolchains//:all") main_extension = use_extension("//:paket.main_extension.bzl", "main_extension") use_repo(main_extension, "paket.main") + +# This is only required because rules_cc is required for the Bazel CI RBE config +# If you are using the e2e tests as an example for your own project, you can remove this +bazel_dep(name = "rules_cc", version = "0.0.9", dev_dependency = True) diff --git a/e2e/net7.0/WORKSPACE.bzlmod b/e2e/net7.0/WORKSPACE.bzlmod new file mode 100644 index 00000000..8985b571 --- /dev/null +++ b/e2e/net7.0/WORKSPACE.bzlmod @@ -0,0 +1,20 @@ +# NOTE: This file is only needed to get the Bazel CI RBE working + +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") + +http_archive( + name = "bazelci_rules", + sha256 = "eca21884e6f66a88c358e580fd67a6b148d30ab57b1680f62a96c00f9bc6a07e", + strip_prefix = "bazelci_rules-1.0.0", + url = "https://github.com/bazelbuild/continuous-integration/releases/download/rules-1.0.0/bazelci_rules-1.0.0.tar.gz", +) + +load("@bazelci_rules//:rbe_repo.bzl", "rbe_preconfig") + +# Creates a default toolchain config for RBE. +# Use this as is if you are using the rbe_ubuntu16_04 container, +# otherwise refer to RBE docs. +rbe_preconfig( + name = "buildkite_config", + toolchain = "ubuntu1804-bazel-java11", +) diff --git a/e2e/net8.0/MODULE.bazel b/e2e/net8.0/MODULE.bazel index 2858551a..324edd6a 100644 --- a/e2e/net8.0/MODULE.bazel +++ b/e2e/net8.0/MODULE.bazel @@ -20,3 +20,7 @@ register_toolchains("@dotnet_toolchains//:all") main_extension = use_extension("//:paket.main_extension.bzl", "main_extension") use_repo(main_extension, "paket.main") + +# This is only required because rules_cc is required for the Bazel CI RBE config +# If you are using the e2e tests as an example for your own project, you can remove this +bazel_dep(name = "rules_cc", version = "0.0.9", dev_dependency = True) diff --git a/e2e/net8.0/WORKSPACE.bzlmod b/e2e/net8.0/WORKSPACE.bzlmod new file mode 100644 index 00000000..8985b571 --- /dev/null +++ b/e2e/net8.0/WORKSPACE.bzlmod @@ -0,0 +1,20 @@ +# NOTE: This file is only needed to get the Bazel CI RBE working + +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") + +http_archive( + name = "bazelci_rules", + sha256 = "eca21884e6f66a88c358e580fd67a6b148d30ab57b1680f62a96c00f9bc6a07e", + strip_prefix = "bazelci_rules-1.0.0", + url = "https://github.com/bazelbuild/continuous-integration/releases/download/rules-1.0.0/bazelci_rules-1.0.0.tar.gz", +) + +load("@bazelci_rules//:rbe_repo.bzl", "rbe_preconfig") + +# Creates a default toolchain config for RBE. +# Use this as is if you are using the rbe_ubuntu16_04 container, +# otherwise refer to RBE docs. +rbe_preconfig( + name = "buildkite_config", + toolchain = "ubuntu1804-bazel-java11", +) diff --git a/e2e/smoke/MODULE.bazel b/e2e/smoke/MODULE.bazel index a8d0c24b..19b46037 100644 --- a/e2e/smoke/MODULE.bazel +++ b/e2e/smoke/MODULE.bazel @@ -20,3 +20,7 @@ register_toolchains("@dotnet_toolchains//:all") main_extension = use_extension("//:paket.main_extension.bzl", "main_extension") use_repo(main_extension, "paket.main") + +# This is only required because rules_cc is required for the Bazel CI RBE config +# If you are using the e2e tests as an example for your own project, you can remove this +bazel_dep(name = "rules_cc", version = "0.0.9", dev_dependency = True) diff --git a/e2e/smoke/WORKSPACE.bzlmod b/e2e/smoke/WORKSPACE.bzlmod new file mode 100644 index 00000000..8985b571 --- /dev/null +++ b/e2e/smoke/WORKSPACE.bzlmod @@ -0,0 +1,20 @@ +# NOTE: This file is only needed to get the Bazel CI RBE working + +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") + +http_archive( + name = "bazelci_rules", + sha256 = "eca21884e6f66a88c358e580fd67a6b148d30ab57b1680f62a96c00f9bc6a07e", + strip_prefix = "bazelci_rules-1.0.0", + url = "https://github.com/bazelbuild/continuous-integration/releases/download/rules-1.0.0/bazelci_rules-1.0.0.tar.gz", +) + +load("@bazelci_rules//:rbe_repo.bzl", "rbe_preconfig") + +# Creates a default toolchain config for RBE. +# Use this as is if you are using the rbe_ubuntu16_04 container, +# otherwise refer to RBE docs. +rbe_preconfig( + name = "buildkite_config", + toolchain = "ubuntu1804-bazel-java11", +)