Bump lockfile version

bazelbuild · Feb 8, 2024 · 446d866 · 446d866
1 parent 4b39195
commit 446d866
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 7 deletions.
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh
@@ -254,6 +254,10 @@ EOF
   link_file "${PWD}/src/MODULE.tools" "${BAZEL_TOOLS_REPO}/MODULE.bazel"
   new_hash=$(shasum -a 256 "${BAZEL_TOOLS_REPO}/MODULE.bazel" | awk '{print $1}')
   sed -i.bak "/\"bazel_tools\":/s/\"[a-f0-9]*\"/\"$new_hash\"/" MODULE.bazel.lock
+  # TODO: Temporary hack for lockfile version mismatch, remove these lines after updating to 7.1.0
+  sed -i.bak 's/"lockFileVersion": 3/"lockFileVersion": 4/' MODULE.bazel.lock
+  # Replace canonical repository names and parts thereof of the form rules_foo~1.2.3 with rules_foo~
+  sed -i.bak -E 's/([a-z]([a-z0-9._-]*[a-z0-9]){0,1})~[a-zA-Z0-9.]{1,}(-[0-9.-]{1,}){0,1}(\+[0-9.-]{1,}){0,1}/\1/g' MODULE.bazel.lock
   rm MODULE.bazel.lock.bak
 
   mkdir -p "${BAZEL_TOOLS_REPO}/src/conditions"

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelLockFileValue.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelLockFileValue.java
@@ -37,7 +37,7 @@
 @GenerateTypeAdapter
 public abstract class BazelLockFileValue implements SkyValue, Postable {
 
-  public static final int LOCK_FILE_VERSION = 3;
+  public static final int LOCK_FILE_VERSION = 4;
 
   @SerializationConstant public static final SkyKey KEY = () -> SkyFunctions.BAZEL_LOCK_FILE;
 

diff --git a/src/test/shell/bazel/bazel_determinism_test.sh b/src/test/shell/bazel/bazel_determinism_test.sh
@@ -72,6 +72,10 @@ function test_determinism()  {
     # Update the hash of bazel_tools in lockfile to avoid rerunning module resolution.
     new_hash=$(shasum -a 256 "src/MODULE.tools" | awk '{print $1}')
     sed -i.bak "/\"bazel_tools\":/s/\"[a-f0-9]*\"/\"$new_hash\"/" MODULE.bazel.lock
+    # TODO: Temporary hack for lockfile version mismatch, remove these lines after updating to 7.1.0
+    sed -i.bak 's/"lockFileVersion": 3/"lockFileVersion": 4/' MODULE.bazel.lock
+    # Replace canonical repository names and parts thereof of the form rules_foo~1.2.3 with rules_foo~
+    sed -i.bak -E 's/([a-z]([a-z0-9._-]*[a-z0-9]){0,1})~[a-zA-Z0-9.]{1,}(-[0-9.-]{1,}){0,1}(\+[0-9.-]{1,}){0,1}/\1/g' MODULE.bazel.lock
     rm MODULE.bazel.lock.bak
 
     # Use @bazel_tools//tools/python:autodetecting_toolchain to avoid

diff --git a/src/test/tools/bzlmod/MODULE.bazel.lock b/src/test/tools/bzlmod/MODULE.bazel.lock
diff --git a/src/tools/bzlmod/utils.bzl b/src/tools/bzlmod/utils.bzl
@@ -75,7 +75,7 @@ def parse_http_artifacts(ctx, lockfile_path, required_repos):
 
     for extension_id, extension_entry in lockfile["moduleExtensions"].items():
         if extension_id.startswith("@@"):
-            # @@rules_foo~1.2.3//:extensions.bzl%foo --> rules_foo~1.2.3
+            # @@rules_foo~//:extensions.bzl%foo --> rules_foo~
             module_repo_name = extension_id.removeprefix("@@").partition("//")[0]
         else:
             # //:extensions.bzl%foo --> _main