Skip to content

Commit dcd4485

Browse files
committed
Go: Move to new packaging rules.
1 parent d66d7d8 commit dcd4485

File tree

5 files changed

+18
-81
lines changed

5 files changed

+18
-81
lines changed

go/BUILD.bazel

Lines changed: 12 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
load("@bazel_skylib//rules:native_binary.bzl", "native_binary")
2-
load("@rules_pkg//pkg:install.bzl", "pkg_install")
3-
load("@rules_pkg//pkg:mappings.bzl", "pkg_attributes", "pkg_filegroup", "pkg_files")
4-
load("//:defs.bzl", "codeql_platform")
2+
load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
3+
load("//misc/bazel:pkg.bzl", "codeql_pack", "codeql_pkg_files")
54

65
native_binary(
76
name = "gazelle",
@@ -44,50 +43,27 @@ pkg_files(
4443
],
4544
)
4645

47-
pkg_filegroup(
48-
name = "extractor-pack-generic",
49-
srcs = [
50-
":resources",
51-
"//go/codeql-tools",
52-
"//go/downgrades",
53-
"//go/extractor:tokenizer",
54-
],
55-
visibility = ["//visibility:public"],
56-
)
57-
58-
pkg_files(
46+
codeql_pkg_files(
5947
name = "extractor-pack-arch",
60-
srcs = [
48+
exes = [
6149
"//go/extractor/cli/go-autobuilder",
6250
"//go/extractor/cli/go-bootstrap",
6351
"//go/extractor/cli/go-build-runner",
6452
"//go/extractor/cli/go-extractor",
6553
"//go/extractor/cli/go-gen-dbscheme",
6654
"//go/extractor/cli/go-tokenizer",
6755
],
68-
attributes = pkg_attributes(mode = "0755"),
69-
prefix = "tools/" + codeql_platform,
70-
visibility = ["//visibility:public"],
56+
prefix = "tools/{CODEQL_PLATFORM}",
7157
)
7258

73-
pkg_filegroup(
74-
name = "extractor-pack",
59+
codeql_pack(
60+
name = "go",
7561
srcs = [
7662
":extractor-pack-arch",
77-
":extractor-pack-generic",
63+
":resources",
64+
"//go/codeql-tools",
65+
"//go/downgrades",
66+
"//go/extractor:tokenizer",
7867
],
79-
visibility = ["//visibility:public"],
80-
)
81-
82-
pkg_install(
83-
name = "_extractor_pack",
84-
srcs = [":extractor-pack"],
85-
)
86-
87-
py_binary(
88-
name = "create-extractor-pack",
89-
srcs = ["create_extractor_pack.py"],
90-
env = {"REPO_NAME": repo_name()},
91-
main = "create_extractor_pack.py",
92-
deps = ["_extractor_pack"],
68+
install_dest = "build/codeql-extractor-pack",
9369
)

go/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ qhelp-to-markdown:
2828
scripts/qhelp-to-markdown.sh ql/src "$(QHELP_OUT_DIR)"
2929

3030
extractor:
31-
bazel run :create-extractor-pack
31+
bazel run :go-installer
3232

3333
gen:
3434
bazel run :gen

go/actions/test/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ runs:
4040
- name: Build
4141
shell: bash
4242
run: |
43-
bazel run go:create-extractor-pack
43+
bazel run go:go-installer
4444
4545
- name: Check that all Go code is autoformatted
4646
if: inputs.run-code-checks == 'true' && !cancelled()

go/codeql-tools/BUILD.bazel

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,15 @@
1-
load("@rules_pkg//pkg:mappings.bzl", "pkg_attributes", "pkg_filegroup", "pkg_files")
1+
load("//misc/bazel:pkg.bzl", "codeql_pkg_files")
22

3-
pkg_files(
4-
name = "sh-files",
5-
srcs = glob(["*.sh"]),
6-
attributes = pkg_attributes(mode = "0755"),
7-
)
8-
9-
pkg_files(
10-
name = "non-sh-files",
3+
codeql_pkg_files(
4+
name = "codeql-tools",
115
srcs = glob(
126
["*"],
137
exclude = [
148
"*.sh",
159
"BUILD.bazel",
1610
],
1711
),
18-
)
19-
20-
pkg_filegroup(
21-
name = "codeql-tools",
22-
srcs = [
23-
":non-sh-files",
24-
":sh-files",
25-
],
12+
exes = glob(["*.sh"]),
2613
prefix = "tools",
2714
visibility = ["//go:__pkg__"],
2815
)

go/create_extractor_pack.py

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)