diff --git a/.bazelignore b/.bazelignore index ebba3c11..848196b1 100644 --- a/.bazelignore +++ b/.bazelignore @@ -1,5 +1,6 @@ pkg/dep -**/*.bazel_ignore +.bazelignore +.bazel_ignore node_modules ci_output vendor/github.com/grpc-ecosystem/grpc-gateway diff --git a/WORKSPACE b/WORKSPACE index 99097313..25ebbce6 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -15,14 +15,22 @@ http_archive( ) # --start python-- -load("//wrksp:python_download.bzl", "python_download") +# --end python-- -python_download() +# Start rules_pkg (for pkg_tar in rules_resf/internal/container:container.bzl) +http_archive( + name = "rules_pkg", + sha256 = "d20c951960ed77cb7b341c2a59488534e494d5ad1d30c4818c736d57772a9fef", + urls = [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/1.0.1/rules_pkg-1.0.1.tar.gz", + "https://github.com/bazelbuild/rules_pkg/releases/download/1.0.1/rules_pkg-1.0.1.tar.gz", + ], +) -load("//wrksp:python_deps.bzl", "python_deps") +load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies") -python_deps() -# --end python-- +rules_pkg_dependencies() +# End rules_pkg http_archive( name = "com_google_protobuf", diff --git a/rules_resf/internal/container/container.bzl b/rules_resf/internal/container/container.bzl index adc2ed08..18e37162 100644 --- a/rules_resf/internal/container/container.bzl +++ b/rules_resf/internal/container/container.bzl @@ -1,4 +1,4 @@ -load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar") +load("@rules_pkg//:pkg.bzl", "pkg_tar") load("@io_bazel_rules_docker//container:container.bzl", "container_image", "container_layer", "container_push") load("@io_bazel_rules_docker//nodejs:image.bzl", "nodejs_image") diff --git a/vendor/bazel.build/protobuf/build.pb.go b/vendor/bazel.build/protobuf/build.pb.go index 14860bb2..f186c98f 100644 --- a/vendor/bazel.build/protobuf/build.pb.go +++ b/vendor/bazel.build/protobuf/build.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.32.0 +// protoc-gen-go v1.34.2 // protoc v4.25.3 // source: build/bazel/protobuf/build.proto @@ -2785,7 +2785,7 @@ func file_build_bazel_protobuf_build_proto_rawDescGZIP() []byte { var file_build_bazel_protobuf_build_proto_enumTypes = make([]protoimpl.EnumInfo, 5) var file_build_bazel_protobuf_build_proto_msgTypes = make([]protoimpl.MessageInfo, 25) -var file_build_bazel_protobuf_build_proto_goTypes = []interface{}{ +var file_build_bazel_protobuf_build_proto_goTypes = []any{ (FilesetEntry_SymlinkBehavior)(0), // 0: blaze_query.FilesetEntry.SymlinkBehavior (Attribute_Discriminator)(0), // 1: blaze_query.Attribute.Discriminator (Attribute_Tristate)(0), // 2: blaze_query.Attribute.Tristate @@ -2873,7 +2873,7 @@ func file_build_bazel_protobuf_build_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_build_bazel_protobuf_build_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_build_bazel_protobuf_build_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*License); i { case 0: return &v.state @@ -2885,7 +2885,7 @@ func file_build_bazel_protobuf_build_proto_init() { return nil } } - file_build_bazel_protobuf_build_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_build_bazel_protobuf_build_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*StringDictEntry); i { case 0: return &v.state @@ -2897,7 +2897,7 @@ func file_build_bazel_protobuf_build_proto_init() { return nil } } - file_build_bazel_protobuf_build_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_build_bazel_protobuf_build_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*LabelDictUnaryEntry); i { case 0: return &v.state @@ -2909,7 +2909,7 @@ func file_build_bazel_protobuf_build_proto_init() { return nil } } - file_build_bazel_protobuf_build_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_build_bazel_protobuf_build_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*LabelListDictEntry); i { case 0: return &v.state @@ -2921,7 +2921,7 @@ func file_build_bazel_protobuf_build_proto_init() { return nil } } - file_build_bazel_protobuf_build_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_build_bazel_protobuf_build_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*LabelKeyedStringDictEntry); i { case 0: return &v.state @@ -2933,7 +2933,7 @@ func file_build_bazel_protobuf_build_proto_init() { return nil } } - file_build_bazel_protobuf_build_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_build_bazel_protobuf_build_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*StringListDictEntry); i { case 0: return &v.state @@ -2945,7 +2945,7 @@ func file_build_bazel_protobuf_build_proto_init() { return nil } } - file_build_bazel_protobuf_build_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_build_bazel_protobuf_build_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*FilesetEntry); i { case 0: return &v.state @@ -2957,7 +2957,7 @@ func file_build_bazel_protobuf_build_proto_init() { return nil } } - file_build_bazel_protobuf_build_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_build_bazel_protobuf_build_proto_msgTypes[7].Exporter = func(v any, i int) any { switch v := v.(*Attribute); i { case 0: return &v.state @@ -2969,7 +2969,7 @@ func file_build_bazel_protobuf_build_proto_init() { return nil } } - file_build_bazel_protobuf_build_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_build_bazel_protobuf_build_proto_msgTypes[8].Exporter = func(v any, i int) any { switch v := v.(*Rule); i { case 0: return &v.state @@ -2981,7 +2981,7 @@ func file_build_bazel_protobuf_build_proto_init() { return nil } } - file_build_bazel_protobuf_build_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_build_bazel_protobuf_build_proto_msgTypes[9].Exporter = func(v any, i int) any { switch v := v.(*RuleSummary); i { case 0: return &v.state @@ -2993,7 +2993,7 @@ func file_build_bazel_protobuf_build_proto_init() { return nil } } - file_build_bazel_protobuf_build_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_build_bazel_protobuf_build_proto_msgTypes[10].Exporter = func(v any, i int) any { switch v := v.(*PackageGroup); i { case 0: return &v.state @@ -3005,7 +3005,7 @@ func file_build_bazel_protobuf_build_proto_init() { return nil } } - file_build_bazel_protobuf_build_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_build_bazel_protobuf_build_proto_msgTypes[11].Exporter = func(v any, i int) any { switch v := v.(*EnvironmentGroup); i { case 0: return &v.state @@ -3017,7 +3017,7 @@ func file_build_bazel_protobuf_build_proto_init() { return nil } } - file_build_bazel_protobuf_build_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + file_build_bazel_protobuf_build_proto_msgTypes[12].Exporter = func(v any, i int) any { switch v := v.(*SourceFile); i { case 0: return &v.state @@ -3029,7 +3029,7 @@ func file_build_bazel_protobuf_build_proto_init() { return nil } } - file_build_bazel_protobuf_build_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + file_build_bazel_protobuf_build_proto_msgTypes[13].Exporter = func(v any, i int) any { switch v := v.(*GeneratedFile); i { case 0: return &v.state @@ -3041,7 +3041,7 @@ func file_build_bazel_protobuf_build_proto_init() { return nil } } - file_build_bazel_protobuf_build_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + file_build_bazel_protobuf_build_proto_msgTypes[14].Exporter = func(v any, i int) any { switch v := v.(*Target); i { case 0: return &v.state @@ -3053,7 +3053,7 @@ func file_build_bazel_protobuf_build_proto_init() { return nil } } - file_build_bazel_protobuf_build_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { + file_build_bazel_protobuf_build_proto_msgTypes[15].Exporter = func(v any, i int) any { switch v := v.(*QueryResult); i { case 0: return &v.state @@ -3065,7 +3065,7 @@ func file_build_bazel_protobuf_build_proto_init() { return nil } } - file_build_bazel_protobuf_build_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { + file_build_bazel_protobuf_build_proto_msgTypes[16].Exporter = func(v any, i int) any { switch v := v.(*AllowedRuleClassInfo); i { case 0: return &v.state @@ -3077,7 +3077,7 @@ func file_build_bazel_protobuf_build_proto_init() { return nil } } - file_build_bazel_protobuf_build_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { + file_build_bazel_protobuf_build_proto_msgTypes[17].Exporter = func(v any, i int) any { switch v := v.(*AttributeDefinition); i { case 0: return &v.state @@ -3089,7 +3089,7 @@ func file_build_bazel_protobuf_build_proto_init() { return nil } } - file_build_bazel_protobuf_build_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { + file_build_bazel_protobuf_build_proto_msgTypes[18].Exporter = func(v any, i int) any { switch v := v.(*AttributeValue); i { case 0: return &v.state @@ -3101,7 +3101,7 @@ func file_build_bazel_protobuf_build_proto_init() { return nil } } - file_build_bazel_protobuf_build_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { + file_build_bazel_protobuf_build_proto_msgTypes[19].Exporter = func(v any, i int) any { switch v := v.(*RuleDefinition); i { case 0: return &v.state @@ -3113,7 +3113,7 @@ func file_build_bazel_protobuf_build_proto_init() { return nil } } - file_build_bazel_protobuf_build_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { + file_build_bazel_protobuf_build_proto_msgTypes[20].Exporter = func(v any, i int) any { switch v := v.(*BuildLanguage); i { case 0: return &v.state @@ -3125,7 +3125,7 @@ func file_build_bazel_protobuf_build_proto_init() { return nil } } - file_build_bazel_protobuf_build_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { + file_build_bazel_protobuf_build_proto_msgTypes[21].Exporter = func(v any, i int) any { switch v := v.(*Attribute_SelectorEntry); i { case 0: return &v.state @@ -3137,7 +3137,7 @@ func file_build_bazel_protobuf_build_proto_init() { return nil } } - file_build_bazel_protobuf_build_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { + file_build_bazel_protobuf_build_proto_msgTypes[22].Exporter = func(v any, i int) any { switch v := v.(*Attribute_Selector); i { case 0: return &v.state @@ -3149,7 +3149,7 @@ func file_build_bazel_protobuf_build_proto_init() { return nil } } - file_build_bazel_protobuf_build_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { + file_build_bazel_protobuf_build_proto_msgTypes[23].Exporter = func(v any, i int) any { switch v := v.(*Attribute_SelectorList); i { case 0: return &v.state @@ -3161,7 +3161,7 @@ func file_build_bazel_protobuf_build_proto_init() { return nil } } - file_build_bazel_protobuf_build_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { + file_build_bazel_protobuf_build_proto_msgTypes[24].Exporter = func(v any, i int) any { switch v := v.(*AttributeValue_DictEntry); i { case 0: return &v.state diff --git a/vendor/github.com/hashicorp/hcl/.gitignore b/vendor/github.com/hashicorp/hcl/.gitignore index 822fa09f..15586a2b 100644 --- a/vendor/github.com/hashicorp/hcl/.gitignore +++ b/vendor/github.com/hashicorp/hcl/.gitignore @@ -1,9 +1,9 @@ -y.output - -# ignore intellij files -.idea -*.iml -*.ipr -*.iws - -*.test +y.output + +# ignore intellij files +.idea +*.iml +*.ipr +*.iws + +*.test diff --git a/vendor/github.com/hashicorp/hcl/Makefile b/vendor/github.com/hashicorp/hcl/Makefile index 9fafd501..84fd743f 100644 --- a/vendor/github.com/hashicorp/hcl/Makefile +++ b/vendor/github.com/hashicorp/hcl/Makefile @@ -1,18 +1,18 @@ -TEST?=./... - -default: test - -fmt: generate - go fmt ./... - -test: generate - go get -t ./... - go test $(TEST) $(TESTARGS) - -generate: - go generate ./... - -updatedeps: - go get -u golang.org/x/tools/cmd/stringer - -.PHONY: default generate test updatedeps +TEST?=./... + +default: test + +fmt: generate + go fmt ./... + +test: generate + go get -t ./... + go test $(TEST) $(TESTARGS) + +generate: + go generate ./... + +updatedeps: + go get -u golang.org/x/tools/cmd/stringer + +.PHONY: default generate test updatedeps diff --git a/wrksp/python_deps.bzl b/wrksp/python_deps.bzl deleted file mode 100644 index 92df818d..00000000 --- a/wrksp/python_deps.bzl +++ /dev/null @@ -1,4 +0,0 @@ -load("@rules_python//python:pip.bzl", "pip_repositories") - -def python_deps(): - pip_repositories() diff --git a/wrksp/python_download.bzl b/wrksp/python_download.bzl deleted file mode 100644 index 97766463..00000000 --- a/wrksp/python_download.bzl +++ /dev/null @@ -1,8 +0,0 @@ -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") - -def python_download(): - http_archive( - name = "rules_python", - url = "https://github.com/bazelbuild/rules_python/releases/download/0.2.0/rules_python-0.2.0.tar.gz", - sha256 = "778197e26c5fbeb07ac2a2c5ae405b30f6cb7ad1f5510ea6fdac03bded96cc6f", - )