mirror of
https://github.com/github/codeql.git
synced 2025-12-16 16:53:25 +01:00
Bazel/Go: remove apple_support
This was actually unnecessary, and requried a full Xcode installation that we'd rather avoid.
This commit is contained in:
@@ -13,7 +13,6 @@ local_path_override(
|
||||
|
||||
# see https://registry.bazel.build/ for a list of available packages
|
||||
|
||||
bazel_dep(name = "apple_support", version = "1.15.1-codeql.1")
|
||||
bazel_dep(name = "platforms", version = "0.0.9")
|
||||
bazel_dep(name = "rules_go", version = "0.47.0")
|
||||
bazel_dep(name = "rules_pkg", version = "0.10.1")
|
||||
@@ -58,10 +57,6 @@ use_repo(node, "nodejs", "nodejs_toolchains")
|
||||
go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
|
||||
go_sdk.download(version = "1.22.2") # default
|
||||
|
||||
# following is needed for gazelle on macOS
|
||||
# see https://github.com/bazelbuild/bazel-gazelle/issues/1793
|
||||
go_sdk.download(version = "1.21.9")
|
||||
|
||||
register_toolchains(
|
||||
"@nodejs_toolchains//:all",
|
||||
)
|
||||
|
||||
@@ -1,26 +1,13 @@
|
||||
load("@bazel_skylib//rules:native_binary.bzl", "native_binary")
|
||||
load("@gazelle//:def.bzl", "gazelle")
|
||||
load("@rules_go//go:def.bzl", "go_cross_binary")
|
||||
load("@rules_pkg//pkg:install.bzl", "pkg_install")
|
||||
load("@rules_pkg//pkg:mappings.bzl", "pkg_attributes", "pkg_filegroup", "pkg_files")
|
||||
load("@rules_pkg//pkg:zip.bzl", "pkg_zip")
|
||||
load("//:defs.bzl", "codeql_platform")
|
||||
|
||||
# following is needed for running gazelle on macOS
|
||||
# see https://github.com/bazelbuild/bazel-gazelle/issues/1793
|
||||
go_cross_binary(
|
||||
name = "gazelle-1.21.9",
|
||||
sdk_version = "1.21.9",
|
||||
target = "@gazelle//cmd/gazelle",
|
||||
)
|
||||
|
||||
gazelle(
|
||||
name = "gazelle",
|
||||
extra_args = ["go/extractor"],
|
||||
gazelle = select({
|
||||
"@platforms//os:macos": ":gazelle-1.21.9",
|
||||
"//conditions:default": "@gazelle//cmd/gazelle",
|
||||
}),
|
||||
)
|
||||
|
||||
_gen_binaries = [
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
module(
|
||||
name = "apple_support",
|
||||
version = "1.15.1-codeql.1",
|
||||
bazel_compatibility = [">=6.0.0"],
|
||||
compatibility_level = 1,
|
||||
repo_name = "build_bazel_apple_support",
|
||||
)
|
||||
|
||||
bazel_dep(name = "bazel_skylib", version = "1.3.0")
|
||||
bazel_dep(name = "platforms", version = "0.0.9")
|
||||
|
||||
bazel_dep(
|
||||
name = "stardoc",
|
||||
version = "0.6.2",
|
||||
dev_dependency = True,
|
||||
repo_name = "io_bazel_stardoc",
|
||||
)
|
||||
@@ -1,20 +0,0 @@
|
||||
diff --git a/MODULE.bazel b/MODULE.bazel
|
||||
index 6b06c3b..99bc7c6 100644
|
||||
--- a/MODULE.bazel
|
||||
+++ b/MODULE.bazel
|
||||
@@ -1,6 +1,6 @@
|
||||
module(
|
||||
name = "apple_support",
|
||||
- version = "0",
|
||||
+ version = "1.15.1-codeql.1",
|
||||
bazel_compatibility = [">=6.0.0"],
|
||||
compatibility_level = 1,
|
||||
repo_name = "build_bazel_apple_support",
|
||||
@@ -16,7 +16,3 @@ bazel_dep(
|
||||
repo_name = "io_bazel_stardoc",
|
||||
)
|
||||
|
||||
-apple_cc_configure = use_extension("//crosstool:setup.bzl", "apple_cc_configure_extension")
|
||||
-use_repo(apple_cc_configure, "local_config_apple_cc", "local_config_apple_cc_toolchains")
|
||||
-
|
||||
-register_toolchains("@local_config_apple_cc_toolchains//:all")
|
||||
@@ -1,9 +0,0 @@
|
||||
{
|
||||
"integrity": "sha256-xLsrc2fEhDgjAK7nW+WYuS+EeJb7MbvSLzojRq32aoA=",
|
||||
"strip_prefix": "",
|
||||
"url": "https://github.com/bazelbuild/apple_support/releases/download/1.15.1/apple_support.1.15.1.tar.gz",
|
||||
"patches": {
|
||||
"module.patch": "sha256-K06B2W9t6nKcU8S5u6cWeNIdw/vGWWKAoJdGiI8CSS0="
|
||||
},
|
||||
"patch_strip": 1
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"versions": [
|
||||
"1.15.1-codeql.1"
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user