Bazel build: Update Imath (AcademySoftwareFoundation#1225)

* Switch to newest Bazel version 5.0.0 Signed-off-by: Vertexwahn <julian.amann@tum.de> * Make use of newest bazelisk version in CI Signed-off-by: Vertexwahn <julian.amann@tum.de> * Switch to Imath 3.1.4 Signed-off-by: Vertexwahn <julian.amann@tum.de> Signed-off-by: Cary Phillips <cary@ilm.com>
cary-ilm · Jan 23, 2022 · 5af2ea6 · 5af2ea6
1 parent 5f27646
commit 5af2ea6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1,2 @@
-4.1.0
+5.0.0
+
diff --git 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.9.0/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"

diff --git 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
@@ -22,14 +22,14 @@ def openexr_deps():
     )
 
     # sha256 was determined using:
-    # curl -sL https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.1.0.tar.gz --output Imath-3.1.0.tar.gz
-    # sha256sum Imath-3.1.0.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.0",
-        sha256 = "211c907ab26d10bd01e446da42f073ee7381e1913d8fa48084444bc4e1b4ef87",
-        urls = ["https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.1.0.tar.gz"],
+        strip_prefix = "Imath-3.1.4",
+        sha256 = "fcca5fbb37d375a252bacd8a29935569bdc28b888f01ef1d9299ca0c9e87c17a",
+        urls = ["https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.1.4.tar.gz"],
     )