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.

Sign up for GitHub

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

Jump to bottom

⬆️ Update LRE toolchains #236

Merged
merged 1 commit into from
May 13, 2024
Merged

⬆️ Update LRE toolchains #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 0 additions & 21 deletions .golangci.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion devtools/up.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ let
nix = pkgs.nix;

# The specific commit to use
nativelinkCommit = "60f712bcddd5c2cd3d3bdd537c4cc136fe6497c7";
nativelinkCommit = "8a632953b86395088e4ab8c1e160a650739549b7";

# Base URL for GitHub access
githubBaseUrl = "github:TraceMachina/nativelink/";
Expand Down
4 changes: 2 additions & 2 deletions examples/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
bazel_dep(name = "bazel_skylib", version = "1.5.0")
bazel_dep(name = "rules_ll", version = "20230411.0")
bazel_dep(name = "bazel_skylib", version = "1.6.1")
bazel_dep(name = "rules_ll", version = "0")
local_path_override(
module_name = "rules_ll",
path = "..",
Expand Down
26 changes: 13 additions & 13 deletions flake.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
};
nativelink = {
# Note: Keep this commit in sync with the LRE commit in `ll/init.bzl`.
url = "github:TraceMachina/nativelink/60f712bcddd5c2cd3d3bdd537c4cc136fe6497c7";
url = "github:TraceMachina/nativelink/8a632953b86395088e4ab8c1e160a650739549b7";

# This repository provides the autogenerated LRE toolchains which are
# dependent on the nixpkgs version in the nativelink repository. To keep
Expand Down
6 changes: 3 additions & 3 deletions ll/init.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ def _initialize_rules_ll_impl(_):
http_archive(
name = "local-remote-execution",
urls = [
"https://github.com/TraceMachina/nativelink/archive/60f712bcddd5c2cd3d3bdd537c4cc136fe6497c7.zip",
"https://github.com/TraceMachina/nativelink/archive/8a632953b86395088e4ab8c1e160a650739549b7.zip",
],
integrity = "sha256-ilNs8EmJe0YxrKTzbHXhxmEiayLkc+P0UaA991txgsg=",
integrity = "sha256-L+I3608IU4mDSqLWJ6zJV5zA17zGVay8c8TvmLkoneY=",
# Note: Keep this in sync with `flake.nix` and `devtools/up.sh`.
strip_prefix = "nativelink-60f712bcddd5c2cd3d3bdd537c4cc136fe6497c7/local-remote-execution",
strip_prefix = "nativelink-8a632953b86395088e4ab8c1e160a650739549b7/local-remote-execution",
)

http_archive(
Expand Down
3 changes: 3 additions & 0 deletions templates/default/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,6 @@ bazel-*

# Ignore NativeLink's local Pulumi stack.
Pulumi.dev.yaml

# Ignore the generated kustomization from NativeLink.
/kustomization.yaml
4 changes: 2 additions & 2 deletions templates/default/flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
inputs.flake-utils.follows = "flake-utils";
};
nativelink = {
# Note: Keep this commit in sync with the LRE commit in `ll/init.bzl`.
url = "github:TraceMachina/nativelink/60f712bcddd5c2cd3d3bdd537c4cc136fe6497c7";
# Note: Keep this commit in sync with the LRE commit in `MODULE.bazel`.
url = "github:TraceMachina/nativelink/8a632953b86395088e4ab8c1e160a650739549b7";

# This repository provides the autogenerated LRE toolchains which are
# dependent on the nixpkgs version in the nativelink repository. To keep
Expand Down