fix: replace skylib with bazel-lib

alexeagle · alexeagle · commit a4c1adcd2fac · 2025-09-29T09:34:54.000-07:00
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -28,5 +28,5 @@ jobs:
           {"bazelversion": "6.4.0", "os": "windows-latest"},
           {"bazelversion": "6.4.0", folder: "."},
           {"bazelversion": "6.4.0", bzlmodEnabled: true},
-          {folder: "e2e/conflicting_toolchains", bzlmodEnabled: false},
+          {folder: "e2e/conflicting_toolchains", bzlmodEnabled: false}
         ]
diff --git a/e2e/headers/WORKSPACE.bazel b/e2e/headers/WORKSPACE.bazel
@@ -10,7 +10,8 @@ load("@rules_nodejs//nodejs:repositories.bzl", "nodejs_register_toolchains")
 nodejs_register_toolchains(include_headers = True)
 
 http_archive(
-    name = "bazel_skylib",
-    sha256 = "bc283cdfcd526a52c3201279cda4bc298652efa898b10b4db0837dc51652756f",
-    urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz"],
+    name = "bazel_lib",
+    sha256 = "46960e9fa6c9352d883768280951ac388dba8cb9ff0256182fb77925eae2b6ac",
+    strip_prefix = "bazel-lib-3.0.0-beta.1",
+    url = "https://github.com/bazel-contrib/bazel-lib/releases/download/v3.0.0-beta.1/bazel-lib-v3.0.0-beta.1.tar.gz",
 )
diff --git a/e2e/nodejs_host/WORKSPACE.bazel b/e2e/nodejs_host/WORKSPACE.bazel
@@ -37,7 +37,8 @@ nodejs_register_toolchains(
 )
 
 http_archive(
-    name = "bazel_skylib",
-    sha256 = "bc283cdfcd526a52c3201279cda4bc298652efa898b10b4db0837dc51652756f",
-    urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz"],
+    name = "bazel_lib",
+    sha256 = "46960e9fa6c9352d883768280951ac388dba8cb9ff0256182fb77925eae2b6ac",
+    strip_prefix = "bazel-lib-3.0.0-beta.1",
+    url = "https://github.com/bazel-contrib/bazel-lib/releases/download/v3.0.0-beta.1/bazel-lib-v3.0.0-beta.1.tar.gz",
 )

Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,5 @@ jobs:`
`28`	`28`	`{"bazelversion": "6.4.0", "os": "windows-latest"},`
`29`	`29`	`{"bazelversion": "6.4.0", folder: "."},`
`30`	`30`	`{"bazelversion": "6.4.0", bzlmodEnabled: true},`
`31`		`- {folder: "e2e/conflicting_toolchains", bzlmodEnabled: false},`
	`31`	`+ {folder: "e2e/conflicting_toolchains", bzlmodEnabled: false}`
`32`	`32`	`]`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,8 @@ nodejs_register_toolchains(`
`37`	`37`	`)`
`38`	`38`
`39`	`39`	`http_archive(`
`40`		`- name = "bazel_skylib",`
`41`		`- sha256 = "bc283cdfcd526a52c3201279cda4bc298652efa898b10b4db0837dc51652756f",`
`42`		`- urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz"],`
	`40`	`+ name = "bazel_lib",`
	`41`	`+ sha256 = "46960e9fa6c9352d883768280951ac388dba8cb9ff0256182fb77925eae2b6ac",`
	`42`	`+ strip_prefix = "bazel-lib-3.0.0-beta.1",`
	`43`	`+ url = "https://github.com/bazel-contrib/bazel-lib/releases/download/v3.0.0-beta.1/bazel-lib-v3.0.0-beta.1.tar.gz",`
`43`	`44`	`)`