From a1fbf1fb4989ce650939dcb5f721180233b7922e Mon Sep 17 00:00:00 2001 From: Brentley Jones Date: Wed, 10 Jul 2024 10:54:30 -0500 Subject: [PATCH] rules_swift@2.1.1 (#2405) Release: https://github.com/bazelbuild/rules_swift/releases/tag/2.1.1 Signed-off-by: Brentley Jones --- modules/rules_swift/2.1.1/MODULE.bazel | 44 +++++++++++++++++++ .../patches/module_dot_bazel_version.patch | 12 +++++ modules/rules_swift/2.1.1/presubmit.yml | 36 +++++++++++++++ modules/rules_swift/2.1.1/source.json | 9 ++++ modules/rules_swift/metadata.json | 3 +- 5 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 modules/rules_swift/2.1.1/MODULE.bazel create mode 100644 modules/rules_swift/2.1.1/patches/module_dot_bazel_version.patch create mode 100644 modules/rules_swift/2.1.1/presubmit.yml create mode 100644 modules/rules_swift/2.1.1/source.json diff --git a/modules/rules_swift/2.1.1/MODULE.bazel b/modules/rules_swift/2.1.1/MODULE.bazel new file mode 100644 index 00000000000..50ce40ed4c7 --- /dev/null +++ b/modules/rules_swift/2.1.1/MODULE.bazel @@ -0,0 +1,44 @@ +module( + name = "rules_swift", + version = "2.1.1", + bazel_compatibility = [">=6.0.0"], + compatibility_level = 2, + repo_name = "build_bazel_rules_swift", +) + +bazel_dep(name = "bazel_features", version = "1.3.0") +bazel_dep(name = "bazel_skylib", version = "1.3.0") +bazel_dep(name = "apple_support", version = "1.15.1", repo_name = "build_bazel_apple_support") +bazel_dep(name = "rules_cc", version = "0.0.2") +bazel_dep(name = "platforms", version = "0.0.9") +bazel_dep(name = "protobuf", version = "21.7", repo_name = "com_google_protobuf") +bazel_dep(name = "rules_proto", version = "5.3.0-21.7") +bazel_dep(name = "nlohmann_json", version = "3.6.1", repo_name = "com_github_nlohmann_json") +bazel_dep( + name = "swift_argument_parser", + version = "1.3.1.1", + repo_name = "com_github_apple_swift_argument_parser", +) + +non_module_deps = use_extension("//swift:extensions.bzl", "non_module_deps") +use_repo( + non_module_deps, + "build_bazel_rules_swift_index_import", + "build_bazel_rules_swift_local_config", + "com_github_apple_swift_docc_symbolkit", + "com_github_apple_swift_log", + "com_github_apple_swift_nio", + "com_github_apple_swift_nio_extras", + "com_github_apple_swift_nio_http2", + "com_github_apple_swift_nio_transport_services", + "com_github_apple_swift_protobuf", + "com_github_grpc_grpc_swift", +) + +apple_cc_configure = use_extension("@build_bazel_apple_support//crosstool:setup.bzl", "apple_cc_configure_extension") +use_repo(apple_cc_configure, "local_config_apple_cc") + +# Dev dependencies +bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.5.0", dev_dependency = True) +bazel_dep(name = "gazelle", version = "0.33.0", dev_dependency = True, repo_name = "bazel_gazelle") +bazel_dep(name = "stardoc", version = "0.6.2", dev_dependency = True, repo_name = "io_bazel_stardoc") diff --git a/modules/rules_swift/2.1.1/patches/module_dot_bazel_version.patch b/modules/rules_swift/2.1.1/patches/module_dot_bazel_version.patch new file mode 100644 index 00000000000..1e359d47bd1 --- /dev/null +++ b/modules/rules_swift/2.1.1/patches/module_dot_bazel_version.patch @@ -0,0 +1,12 @@ +=================================================================== +--- a/MODULE.bazel ++++ b/MODULE.bazel +@@ -1,7 +1,7 @@ + module( + name = "rules_swift", +- version = "0", ++ version = "2.1.1", + bazel_compatibility = [">=6.0.0"], + compatibility_level = 2, + repo_name = "build_bazel_rules_swift", + ) diff --git a/modules/rules_swift/2.1.1/presubmit.yml b/modules/rules_swift/2.1.1/presubmit.yml new file mode 100644 index 00000000000..9eee4598655 --- /dev/null +++ b/modules/rules_swift/2.1.1/presubmit.yml @@ -0,0 +1,36 @@ +shell_commands: &shell_commands +- "echo --- Downloading and extracting Swift $SWIFT_VERSION to $SWIFT_HOME" +- "mkdir $SWIFT_HOME" +- "curl https://download.swift.org/swift-${SWIFT_VERSION}-release/ubuntu2004/swift-${SWIFT_VERSION}-RELEASE/swift-${SWIFT_VERSION}-RELEASE-ubuntu20.04.tar.gz | tar xvz --strip-components=1 -C $SWIFT_HOME" + +matrix: + bazel: + - 7.x + - last_green + platform: + - ubuntu2004 +tasks: + verify_targets: + name: Verify build targets + bazel: ${{ bazel }} + platform: ${{ platform }} + environment: + CC: "clang" + SWIFT_VERSION: "5.9.2" + SWIFT_HOME: "$HOME/swift-$SWIFT_VERSION" + PATH: "$PATH:$SWIFT_HOME/usr/bin" + shell_commands: *shell_commands + build_flags: + - "--action_env=PATH" + build_targets: + - "@rules_swift//examples/xplatform/..." + - "-@rules_swift//examples/xplatform/grpc/..." # TODO: Fix grpc on Linux + - "-@rules_swift//examples/xplatform/proto_library_group/..." # TODO: Fix grpc on Linux + verify_targets_macos: + name: Verify build targets + bazel: ${{ bazel }} + platform: macos + build_targets: + - "@rules_swift//examples/apple/..." + build_flags: + - "--repo_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1" diff --git a/modules/rules_swift/2.1.1/source.json b/modules/rules_swift/2.1.1/source.json new file mode 100644 index 00000000000..67ebe689334 --- /dev/null +++ b/modules/rules_swift/2.1.1/source.json @@ -0,0 +1,9 @@ +{ + "integrity": "sha256-mRntHY2uUJZFv9OAU3rmUBUo2N6XHK6+1tUYW5lw3E0=", + "strip_prefix": "", + "url": "https://github.com/bazelbuild/rules_swift/releases/download/2.1.1/rules_swift.2.1.1.tar.gz", + "patches": { + "module_dot_bazel_version.patch": "sha256-/kZbNxPjPQxNaVxijhzrPhwIf8mGwidxih95QYLXSo4=" + }, + "patch_strip": 1 +} diff --git a/modules/rules_swift/metadata.json b/modules/rules_swift/metadata.json index 78e98e3ae2c..7b10fac7df5 100644 --- a/modules/rules_swift/metadata.json +++ b/modules/rules_swift/metadata.json @@ -48,7 +48,8 @@ "1.18.0", "2.0.0-rc1", "2.0.0", - "2.1.0" + "2.1.0", + "2.1.1" ], "yanked_versions": {} }