Skip to content
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
8 changes: 4 additions & 4 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -47,21 +47,21 @@ debs.lock(
)
use_repo(debs, "reactantserver_debs")

# The Julia toolchain, and the image rules (julia/image.bzl): the distribution, depot and
# Julia itself, and the image rules (julia/image.bzl): the distribution, depot and
# precompile-cache layers, the image environment, and the precompile test.
bazel_dep(name = "rules_julia_depot", version = "0.1.0")
git_override(
module_name = "rules_julia_depot",
commit = "cead3479d64e7bf56fac66a15b72e9c4cd45ddc8",
commit = "0f35a92b3660eed9db7d50905cfeea3d3c259669",
remote = "https://github.com/csvance/rules_julia_depot.git",
)

# Julia, fetched and pinned by sha256, so no build host needs it installed. It must match
# deploy/Manifest.toml's julia_version; //deploy:manifest_current fails when they disagree. The
# repository name is prefixed because toolchain names share one namespace across every module
# repository name is prefixed because distribution names share one namespace across every module
# that uses the extension: a consumer that declares its own `julia_dist` must not collide.
julia = use_extension("@rules_julia_depot//julia:extensions.bzl", "julia")
julia.toolchain(
julia.dist(
name = "reactantserver_julia",
version = "1.12.7",
)
Expand Down
6 changes: 3 additions & 3 deletions MODULE.bazel.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions deploy/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ julia_image_env(
# distribution's own relative symlinks are kept, so its libraries are not shipped twice.
julia_dist_layer(
name = "julia_layer",
julia = "@reactantserver_julia//:dist",
julia = "@reactantserver_julia",
)

# The depot, instantiated from the manifest into an empty tree at /opt/julia-depot.
Expand All @@ -237,7 +237,7 @@ julia_depot_layer(
name = "depot_layer",
contents = "full",
env = _REACTANT_GPU_ENV,
julia = "@reactantserver_julia//:dist",
julia = "@reactantserver_julia",
manifest = "Manifest.toml",
project = "//:Project.toml",
# The member Project.tomls, which the workspace's [workspace] table needs to instantiate.
Expand Down Expand Up @@ -300,7 +300,7 @@ julia_compiled_layer(
name = "compiled_layer",
env = _BUILD_LOAD_ENV,
image_env = ":image_env",
julia = "@reactantserver_julia//:dist",
julia = "@reactantserver_julia",
layers = [
":julia_layer",
":depot_layer",
Expand Down Expand Up @@ -352,7 +352,7 @@ julia_precompile_test(
size = "large",
env = _BUILD_LOAD_ENV,
image_env = ":image_env",
julia = "@reactantserver_julia//:dist",
julia = "@reactantserver_julia",
layers = [l for l in _IMAGE_LAYERS if l != ":debs_layer"] + [":cuda_stub_layer"],
projects = _ENTRY_PROJECT_PATHS,
tags = ["manual"],
Expand Down
4 changes: 2 additions & 2 deletions deploy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ build. It lives under `deploy/` only so the root gitignore can stay as it is; a
read the root manifest instead.

`//deploy:manifest_current` fails when a `[deps]` or `[compat]` change leaves the lock stale, or
when the lock was resolved under a Julia other than the pinned toolchain. Move it deliberately and
review the diff like code:
when the lock was resolved under a Julia other than the pinned distribution. Move it deliberately
and review the diff like code:

```
bazel run //deploy:relock # keep every version that still resolves
Expand Down
2 changes: 1 addition & 1 deletion deploy/manifest_current.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ m = TOML.parsefile(joinpath(dirname(Base.active_project()), "Manifest.toml"))
ok = true
if m["julia_version"] != string(VERSION)
println(stderr, "FAIL: deploy/Manifest.toml was resolved under Julia ", m["julia_version"],
" but the pinned toolchain is ", VERSION, ".")
" but the pinned distribution is ", VERSION, ".")
ok = false
end
if !Pkg.is_manifest_current(Pkg.Types.Context())
Expand Down
Loading