Skip to content

Commit

Permalink
Merge pull request #85 from lucidsoftware/various-upgrades
Browse files Browse the repository at this point in the history
Various upgrades, Scala 3, multiplex sandboxing, path mapping
  • Loading branch information
jjudd authored Feb 27, 2025
2 parents cb5c268 + 8920ddf commit 033861d
Show file tree
Hide file tree
Showing 51 changed files with 5,435 additions and 696 deletions.
23 changes: 6 additions & 17 deletions .bazelrc_shared
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,18 @@ build --tool_java_runtime_version="remotejdk_21"

# Other options
build --experimental_use_hermetic_linux_sandbox
build --experimental_worker_sandbox_hardening
build --experimental_worker_cancellation
build --experimental_worker_multiplex_sandboxing
build --experimental_worker_sandbox_hardening
build --strategy=worker,sandboxed,local
build --verbose_failures
build --worker_max_instances=4
build --worker_sandboxing

# Disable multiplex sandboxing because there is a bug that causes files which
# should be in the sandbox to not be. Not sure if this is a Bazel bug or a rule
# set bug. Something we need to deal with either way.
# Once we enable path mapping, we should also be able to get rid of the outgoing
# transition that we're currently relying on to prevent an explosion in the number
# of builds.
#build --experimental_worker_multiplex_sandboxing

# TODO: enable path mapping when we move to Bazel 8. There is a bug in 7. See:
# https://github.com/bazelbuild/bazel/issues/23990
# In the meantime, if you need to test path mapping you should disable multiplex
# workers with the following build option:
#build --noworker_multiplex
#common --experimental_output_paths=strip
#common --modify_execution_info=CppCompile=+supports-path-mapping

common --experimental_output_paths=strip
common --modify_execution_info=CppArchive=+supports-path-mapping
common --modify_execution_info=CppCompile=+supports-path-mapping
common --modify_execution_info=CppModuleMap=+supports-path-mapping

common --announce_rc
common --color=yes
Expand Down
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.1.0
lucidsoftware/8.1.999
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-24.04]
bazel_version: [bazelbuild/8.1.0]
bazel_version: [lucidsoftware/8.1.999]
steps:
- uses: actions/checkout@v3
- uses: bazel-contrib/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ scala_2_12_version = "2.12.19"

scala_2_13_version = "2.13.15"

scala_3_version = "3.5.2"
scala_3_version = "3.3.5"

scalapb_version = "0.11.17"

zinc_version = "1.10.4"
zinc_version = "1.10.7"

annex = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
annex.install(
Expand Down
2,528 changes: 2,528 additions & 0 deletions MODULE.bazel.lock

Large diffs are not rendered by default.

303 changes: 0 additions & 303 deletions annex_2_12_install.json

This file was deleted.

Loading

0 comments on commit 033861d

Please sign in to comment.