From 5ac99688b1cd190aced351b520c7c6cc1401c9d0 Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Sun, 23 Jan 2022 15:33:27 +0100 Subject: [PATCH 1/3] Switch to newest Bazel version 5.0.0 Signed-off-by: Vertexwahn --- .bazelversion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bazelversion b/.bazelversion index fae6e3d04b..0062ac9718 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -4.2.1 +5.0.0 From 41ddbebf9dc460fc3ffe5bdee366032c0c02ff84 Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Sun, 23 Jan 2022 15:36:00 +0100 Subject: [PATCH 2/3] Make use of newest bazelisk version in CI Signed-off-by: Vertexwahn --- .github/workflows/bazel_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bazel_build.yml b/.github/workflows/bazel_build.yml index 9817afc927..12b88e37d0 100644 --- a/.github/workflows/bazel_build.yml +++ b/.github/workflows/bazel_build.yml @@ -42,7 +42,7 @@ jobs: - name: Install bazelisk run: | - curl -LO "https://github.com/bazelbuild/bazelisk/releases/download/v1.10.1/bazelisk-linux-amd64" + curl -LO "https://github.com/bazelbuild/bazelisk/releases/download/v1.11.0/bazelisk-linux-amd64" mkdir -p "${GITHUB_WORKSPACE}/bin/" mv bazelisk-linux-amd64 "${GITHUB_WORKSPACE}/bin/bazel" chmod +x "${GITHUB_WORKSPACE}/bin/bazel" From faaa168261a5418f35f795d15c0418ff13815473 Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Sun, 23 Jan 2022 15:39:12 +0100 Subject: [PATCH 3/3] Switch to Imath 3.1.4 Signed-off-by: Vertexwahn --- bazel/third_party/Imath.BUILD | 8 ++++---- bazel/third_party/openexr_deps.bzl | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bazel/third_party/Imath.BUILD b/bazel/third_party/Imath.BUILD index 097e6ab318..6e483138bd 100644 --- a/bazel/third_party/Imath.BUILD +++ b/bazel/third_party/Imath.BUILD @@ -7,14 +7,14 @@ generate_header( name = "ImathConfig.h", substitutions = { "@IMATH_INTERNAL_NAMESPACE@": "Imath_3_1", - "@IMATH_LIB_VERSION@": "3.1.3", + "@IMATH_LIB_VERSION@": "3.1.4", "@IMATH_NAMESPACE_CUSTOM@": "0", "@IMATH_NAMESPACE@": "Imath", - "@IMATH_PACKAGE_NAME@": "Imath 3.1.3", + "@IMATH_PACKAGE_NAME@": "Imath 3.1.4", "@IMATH_VERSION_MAJOR@": "3", "@IMATH_VERSION_MINOR@": "1", - "@IMATH_VERSION_PATCH@": "3", - "@IMATH_VERSION@": "3.1.3", + "@IMATH_VERSION_PATCH@": "4", + "@IMATH_VERSION@": "3.1.4", "#cmakedefine IMATH_HALF_USE_LOOKUP_TABLE": "#define IMATH_HALF_USE_LOOKUP_TABLE", "#cmakedefine IMATH_ENABLE_API_VISIBILITY": "#define IMATH_ENABLE_API_VISIBILITY", "#cmakedefine IMATH_HAVE_LARGE_STACK": "/* #undef IMATH_HAVE_LARGE_STACK */", diff --git a/bazel/third_party/openexr_deps.bzl b/bazel/third_party/openexr_deps.bzl index 91e6b54774..eef6e75936 100644 --- a/bazel/third_party/openexr_deps.bzl +++ b/bazel/third_party/openexr_deps.bzl @@ -22,14 +22,14 @@ def openexr_deps(): ) # sha256 was determined using: - # curl -sL https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.1.3.tar.gz --output Imath-3.1.3.tar.gz - # sha256sum Imath-3.1.3.tar.gz + # curl -sL https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.1.4.tar.gz --output Imath-3.1.4.tar.gz + # sha256sum Imath-3.1.4.tar.gz # If the hash is incorrect Bazel will report an error and show the actual hash of the file. maybe( http_archive, name = "Imath", build_file = "@openexr//:bazel/third_party/Imath.BUILD", - strip_prefix = "Imath-3.1.3", - sha256 = "0bf7ec51162c4d17a4c5b850fb3f6f7a195cff9fa71f4da7735f74d7b5124320", - urls = ["https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.1.3.tar.gz"], + strip_prefix = "Imath-3.1.4", + sha256 = "fcca5fbb37d375a252bacd8a29935569bdc28b888f01ef1d9299ca0c9e87c17a", + urls = ["https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.1.4.tar.gz"], )