Skip to content

Commit e94d82b

Browse files
Vertexwahncary-ilm
authored andcommitted
Bazel build: Update Imath (#1225)
* 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]> Signed-off-by: Cary Phillips <[email protected]>
1 parent 79ba5ec commit e94d82b

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

.bazelversion

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
4.1.0
1+
5.0.0
2+

.github/workflows/bazel_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242

4343
- name: Install bazelisk
4444
run: |
45-
curl -LO "https://github.com/bazelbuild/bazelisk/releases/download/v1.9.0/bazelisk-linux-amd64"
45+
curl -LO "https://github.com/bazelbuild/bazelisk/releases/download/v1.11.0/bazelisk-linux-amd64"
4646
mkdir -p "${GITHUB_WORKSPACE}/bin/"
4747
mv bazelisk-linux-amd64 "${GITHUB_WORKSPACE}/bin/bazel"
4848
chmod +x "${GITHUB_WORKSPACE}/bin/bazel"

bazel/third_party/Imath.BUILD

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ generate_header(
77
name = "ImathConfig.h",
88
substitutions = {
99
"@IMATH_INTERNAL_NAMESPACE@": "Imath_3_1",
10-
"@IMATH_LIB_VERSION@": "3.1.3",
10+
"@IMATH_LIB_VERSION@": "3.1.4",
1111
"@IMATH_NAMESPACE_CUSTOM@": "0",
1212
"@IMATH_NAMESPACE@": "Imath",
13-
"@IMATH_PACKAGE_NAME@": "Imath 3.1.3",
13+
"@IMATH_PACKAGE_NAME@": "Imath 3.1.4",
1414
"@IMATH_VERSION_MAJOR@": "3",
1515
"@IMATH_VERSION_MINOR@": "1",
16-
"@IMATH_VERSION_PATCH@": "3",
17-
"@IMATH_VERSION@": "3.1.3",
16+
"@IMATH_VERSION_PATCH@": "4",
17+
"@IMATH_VERSION@": "3.1.4",
1818
"#cmakedefine IMATH_HALF_USE_LOOKUP_TABLE": "#define IMATH_HALF_USE_LOOKUP_TABLE",
1919
"#cmakedefine IMATH_ENABLE_API_VISIBILITY": "#define IMATH_ENABLE_API_VISIBILITY",
2020
"#cmakedefine IMATH_HAVE_LARGE_STACK": "/* #undef IMATH_HAVE_LARGE_STACK */",

bazel/third_party/openexr_deps.bzl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ def openexr_deps():
2222
)
2323

2424
# sha256 was determined using:
25-
# curl -sL https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.1.0.tar.gz --output Imath-3.1.0.tar.gz
26-
# sha256sum Imath-3.1.0.tar.gz
25+
# curl -sL https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.1.4.tar.gz --output Imath-3.1.4.tar.gz
26+
# sha256sum Imath-3.1.4.tar.gz
2727
# If the hash is incorrect Bazel will report an error and show the actual hash of the file.
2828
maybe(
2929
http_archive,
3030
name = "Imath",
3131
build_file = "@openexr//:bazel/third_party/Imath.BUILD",
32-
strip_prefix = "Imath-3.1.0",
33-
sha256 = "211c907ab26d10bd01e446da42f073ee7381e1913d8fa48084444bc4e1b4ef87",
34-
urls = ["https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.1.0.tar.gz"],
32+
strip_prefix = "Imath-3.1.4",
33+
sha256 = "fcca5fbb37d375a252bacd8a29935569bdc28b888f01ef1d9299ca0c9e87c17a",
34+
urls = ["https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.1.4.tar.gz"],
3535
)

0 commit comments

Comments
 (0)