Skip to content

Commit

Permalink
Improve support for Bazel 7.x (#414)
Browse files Browse the repository at this point in the history
  • Loading branch information
jpsim committed Apr 8, 2024
1 parent 029b612 commit b131f95
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.4.0rc2
7.1.0
23 changes: 3 additions & 20 deletions .bcr/presubmit.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,7 @@
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"

tasks:
verify_targets_linux:
name: Verify targets (Linux)
platform: ubuntu2004
environment:
CC: "clang"
SWIFT_VERSION: "5.10"
SWIFT_HOME: "$HOME/swift-$SWIFT_VERSION"
PATH: "$PATH:$SWIFT_HOME/usr/bin"
shell_commands: *shell_commands
build_flags:
- "--action_env=PATH"
build_targets:
- '@yams//:Yams'
verify_targets_macos:
name: Verify targets (macOS)
verify_targets:
name: Verify build targets
platform: macos
bazel: 7.x
build_targets:
- '@yams//:Yams'
2 changes: 1 addition & 1 deletion .github/workflows/bazel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ jobs:
- uses: actions/checkout@v3
- uses: bazelbuild/setup-bazelisk@v2
- name: Yams tests
run: bazel test --test_output=all //Tests/...
run: bazel test --test_output=all //Tests:UnitTests
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,4 @@ docs

# Bazel
bazel-*
MODULE.bazel.lock
5 changes: 3 additions & 2 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ module(
compatibility_level = 1,
)

bazel_dep(name = "rules_swift", version = "1.17.0", repo_name = "build_bazel_rules_swift")
bazel_dep(name = "rules_swift", version = "1.18.0", repo_name = "build_bazel_rules_swift")

bazel_dep(name = "apple_support", version = "1.15.1", dev_dependency = True)
bazel_dep(name = "platforms", version = "0.0.9", dev_dependency = True)
bazel_dep(name = "rules_apple", version = "3.3.0", dev_dependency = True)
bazel_dep(name = "rules_apple", version = "3.5.0", dev_dependency = True)

0 comments on commit b131f95

Please sign in to comment.