Skip to content

Commit 8509bca

Browse files
authored
Merge pull request #16615 from github/revert-16432-redsun82/pkg
Revert "Bazel: add codeql specific packaging library"
2 parents 3b246b2 + 31d6b9b commit 8509bca

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+181
-1949
lines changed

.bazelrc

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,15 @@ common --override_module=semmle_code=%workspace%/misc/bazel/semmle_code_stub
1010

1111
build --repo_env=CC=clang --repo_env=CXX=clang++
1212

13-
build:linux --cxxopt=-std=c++20 --host_cxxopt=-std=c++20
13+
build:linux --cxxopt=-std=c++20
1414
# we currently cannot built the swift extractor for ARM
15-
build:macos --cxxopt=-std=c++20 --host_cxxopt=-std=c++20 --copt=-arch --copt=x86_64 --linkopt=-arch --linkopt=x86_64
16-
build:windows --cxxopt=/std:c++20 --cxxopt=/Zc:preprocessor --host_cxxopt=/std:c++20 --host_cxxopt=/Zc:preprocessor
15+
build:macos --cxxopt=-std=c++20 --copt=-arch --copt=x86_64 --linkopt=-arch --linkopt=x86_64
16+
build:windows --cxxopt=/std:c++20 --cxxopt=/Zc:preprocessor
1717

1818
# this requires developer mode, but is required to have pack installer functioning
1919
startup --windows_enable_symlinks
2020
common --enable_runfiles
2121

22-
# with the above, we can avoid building python zips which is the default on windows as that's expensive
23-
build --nobuild_python_zip
24-
2522
common --registry=file:///%workspace%/misc/bazel/registry
2623
common --registry=https://bcr.bazel.build
2724

.gitattributes

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,3 @@ csharp/paket.lock linguist-generated=true
8080
csharp/.paket/Paket.Restore.targets linguist-generated=true eol=crlf
8181
csharp/paket.main.bzl linguist-generated=true
8282
csharp/paket.main_extension.bzl linguist-generated=true
83-
84-
# ripunzip tool
85-
/misc/bazel/internal/ripunzip/ripunzip-* filter=lfs diff=lfs merge=lfs -text
86-
87-
# swift prebuilt resources
88-
/swift/third_party/resource-dir/*.zip filter=lfs diff=lfs merge=lfs -text

.github/workflows/zipmerge-test.yml

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

MODULE.bazel

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "json")
2424
bazel_dep(name = "fmt", version = "10.0.0")
2525
bazel_dep(name = "gazelle", version = "0.36.0")
2626
bazel_dep(name = "rules_dotnet", version = "0.15.1")
27-
bazel_dep(name = "googletest", version = "1.14.0.bcr.1")
2827

2928
bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True)
3029

@@ -68,36 +67,6 @@ use_repo(node, "nodejs", "nodejs_toolchains")
6867
go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
6968
go_sdk.download(version = "1.22.2")
7069

71-
lfs_files = use_repo_rule("//misc/bazel:lfs.bzl", "lfs_files")
72-
73-
lfs_files(
74-
name = "ripunzip-linux",
75-
srcs = ["//misc/bazel/internal/ripunzip:ripunzip-linux"],
76-
executable = True,
77-
)
78-
79-
lfs_files(
80-
name = "ripunzip-windows",
81-
srcs = ["//misc/bazel/internal/ripunzip:ripunzip-windows.exe"],
82-
executable = True,
83-
)
84-
85-
lfs_files(
86-
name = "ripunzip-macos",
87-
srcs = ["//misc/bazel/internal/ripunzip:ripunzip-macos"],
88-
executable = True,
89-
)
90-
91-
lfs_files(
92-
name = "swift-resource-dir-linux",
93-
srcs = ["//swift/third_party/resource-dir:resource-dir-linux.zip"],
94-
)
95-
96-
lfs_files(
97-
name = "swift-resource-dir-macos",
98-
srcs = ["//swift/third_party/resource-dir:resource-dir-macos.zip"],
99-
)
100-
10170
register_toolchains(
10271
"@nodejs_toolchains//:all",
10372
)

misc/bazel/internal/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
exports_files(["install.py"])

misc/bazel/internal/install.py

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

misc/bazel/internal/ripunzip/BUILD.bazel

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

0 commit comments

Comments
 (0)