⬆️ Update LRE toolchains (#236)

Also cleans up some minor leftovers from the removed Go code.
eomii · May 13, 2024 · e0c1e4d · e0c1e4d
1 parent 636c828
commit e0c1e4d
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 43 deletions.
diff --git a/.golangci.yml b/.golangci.yml
diff --git a/devtools/up.nix b/devtools/up.nix
@@ -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/";

diff --git a/examples/MODULE.bazel b/examples/MODULE.bazel
@@ -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 = "..",

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -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

diff --git a/ll/init.bzl b/ll/init.bzl
@@ -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(

diff --git a/templates/default/.gitignore b/templates/default/.gitignore
@@ -21,3 +21,6 @@ bazel-*
 
 # Ignore NativeLink's local Pulumi stack.
 Pulumi.dev.yaml
+
+# Ignore the generated kustomization from NativeLink.
+/kustomization.yaml
diff --git a/templates/default/flake.nix b/templates/default/flake.nix
@@ -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