Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[email protected] #2308

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions modules/rules_swift/2.0.0-rc1/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
module(
name = "rules_swift",
version = "2.0.0-rc1",
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")
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
===================================================================
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -1,6 +1,6 @@
module(
name = "rules_swift",
- version = "0",
+ version = "2.0.0-rc1",
bazel_compatibility = [">=6.0.0"],
compatibility_level = 2,
repo_name = "build_bazel_rules_swift",
@@ -16,7 +16,7 @@ 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.0",
+ version = "1.3.1.1",
repo_name = "com_github_apple_swift_argument_parser",
)

36 changes: 36 additions & 0 deletions modules/rules_swift/2.0.0-rc1/presubmit.yml
Original file line number Diff line number Diff line change
@@ -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"
9 changes: 9 additions & 0 deletions modules/rules_swift/2.0.0-rc1/source.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"integrity": "sha256-TtdgURObe5X7fkiE5nKK+Lesd+fIBYmnyfj23RBuU8k=",
"strip_prefix": "",
"url": "https://github.com/bazelbuild/rules_swift/releases/download/2.0.0-rc1/rules_swift.2.0.0-rc1.tar.gz",
"patches": {
"module_dot_bazel_version.patch": "sha256-U9HiDdrlGM0V1AjUkwsWF/cLzkKdzGNEsTTGp6Hq+Go="
},
"patch_strip": 1
}
3 changes: 2 additions & 1 deletion modules/rules_swift/metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
"1.15.1",
"1.16.0",
"1.17.0",
"1.18.0"
"1.18.0",
"2.0.0-rc1"
],
"yanked_versions": {}
}