From 86d0fb09859951d1e51a889e4ff2b7b3baecf021 Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Sun, 31 Dec 2023 04:31:35 +0100 Subject: [PATCH] Bump skylib in workspace approach (#1605) Default behavior enable_bzlmod was switch (https://github.com/bazelbuild/bazel/issues/18958) Bump Bazel version to 7.0.0 Update Bazel modules Apply buildifier on MODULE.bazel Signed-off-by: Vertexwahn --- .bazelversion | 2 +- .github/workflows/bazel_build.yml | 18 +++++++++--------- MODULE.bazel | 6 +++--- bazel/third_party/openexr_deps.bzl | 6 +++--- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.bazelversion b/.bazelversion index 91e4a9f262..66ce77b7ea 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -6.3.2 +7.0.0 diff --git a/.github/workflows/bazel_build.yml b/.github/workflows/bazel_build.yml index 6ed03b4c95..fc18837ed5 100644 --- a/.github/workflows/bazel_build.yml +++ b/.github/workflows/bazel_build.yml @@ -57,9 +57,9 @@ jobs: run: | bazelisk build //... bazelisk test //... - # Test bzlmod - bazelisk build --enable_bzlmod -- //... - bazelisk test --enable_bzlmod -- //... + # Test without bzlmod + bazelisk build --noenable_bzlmod -- //... + bazelisk test --noenable_bzlmod -- //... build_and_test_windows: name: Windows Server 2022 build @@ -78,9 +78,9 @@ jobs: run: | bazelisk build //... bazelisk test //... - # Test bzlmod - bazelisk build --enable_bzlmod -- //... - bazelisk test --enable_bzlmod -- //... + # Test without bzlmod + bazelisk build --noenable_bzlmod -- //... + bazelisk test --noenable_bzlmod -- //... build_and_test_macos: name: macOS 13 Bazel build @@ -99,6 +99,6 @@ jobs: run: | bazelisk build //... bazelisk test //... - # Test bzlmod - bazelisk build --enable_bzlmod -- //... - bazelisk test --enable_bzlmod -- //... + # Test without bzlmod + bazelisk build --noenable_bzlmod -- //... + bazelisk test --noenable_bzlmod -- //... diff --git a/MODULE.bazel b/MODULE.bazel index ca3ad9860c..464b846470 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -6,7 +6,7 @@ module( compatibility_level = 1, ) -bazel_dep(name = "bazel_skylib", version = "1.4.2") -bazel_dep(name = "imath", repo_name = "Imath", version = "3.1.9") +bazel_dep(name = "bazel_skylib", version = "1.5.0") +bazel_dep(name = "imath", version = "3.1.9", repo_name = "Imath") bazel_dep(name = "libdeflate", version = "1.19") -bazel_dep(name = "platforms", version = "0.0.7") +bazel_dep(name = "platforms", version = "0.0.8") diff --git a/bazel/third_party/openexr_deps.bzl b/bazel/third_party/openexr_deps.bzl index c0833d1c48..5bbd57adf4 100644 --- a/bazel/third_party/openexr_deps.bzl +++ b/bazel/third_party/openexr_deps.bzl @@ -30,9 +30,9 @@ def openexr_deps(): maybe( http_archive, name = "bazel_skylib", - sha256 = "66ffd9315665bfaafc96b52278f57c7e2dd09f5ede279ea6d39b2be471e7e3aa", + sha256 = "cd55a062e763b9349921f0f5db8c3933288dc8ba4f76dd9416aac68acee3cb94", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.4.2/bazel-skylib-1.4.2.tar.gz", - "https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.2/bazel-skylib-1.4.2.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz", + "https://github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz", ], )