Skip to content

Commit

Permalink
Bazel build: Update Imath (#1225)
Browse files Browse the repository at this point in the history
* Switch to newest Bazel version 5.0.0

Signed-off-by: Vertexwahn <[email protected]>

* Make use of newest bazelisk version in CI

Signed-off-by: Vertexwahn <[email protected]>

* Switch to Imath 3.1.4

Signed-off-by: Vertexwahn <[email protected]>
  • Loading branch information
Vertexwahn authored Jan 23, 2022
1 parent e927e52 commit 3c30740
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.2.1
5.0.0
2 changes: 1 addition & 1 deletion .github/workflows/bazel_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions bazel/third_party/Imath.BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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 */",
Expand Down
10 changes: 5 additions & 5 deletions bazel/third_party/openexr_deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
)

0 comments on commit 3c30740

Please sign in to comment.