Skip to content

Commit 74f3a2d

Browse files
Vertexwahncary-ilm
authored andcommittedFeb 16, 2024
Bazel support: Bump Imath to 3.1.10 (#1626)
Signed-off-by: Vertexwahn <julian.amann@tum.de>
1 parent c825a08 commit 74f3a2d

File tree

5 files changed

+33
-11
lines changed

5 files changed

+33
-11
lines changed
 

‎.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.0.0
1+
7.0.2

‎.github/workflows/bazel_build.yml

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ jobs:
4545
runs-on: ubuntu-22.04
4646

4747
steps:
48-
- uses: actions/checkout@v3
48+
- uses: actions/checkout@v4.1.1
4949

5050
- name: Mount Bazel cache
51-
uses: actions/cache@v3
51+
uses: actions/cache@v4.0.0
5252
with:
5353
path: "/home/runner/.cache/bazel"
5454
key: bazel-ubuntu-22
@@ -66,10 +66,10 @@ jobs:
6666
runs-on: windows-2022
6767

6868
steps:
69-
- uses: actions/checkout@v3
69+
- uses: actions/checkout@v4.1.1
7070

7171
- name: Mount Bazel cache
72-
uses: actions/cache@v3
72+
uses: actions/cache@v4.0.0
7373
with:
7474
path: "/home/runner/.cache/bazel"
7575
key: bazel-windows-2022
@@ -87,10 +87,10 @@ jobs:
8787
runs-on: macos-13
8888

8989
steps:
90-
- uses: actions/checkout@v3
90+
- uses: actions/checkout@v4.1.1
9191

9292
- name: Mount Bazel cache
93-
uses: actions/cache@v3
93+
uses: actions/cache@v4.0.0
9494
with:
9595
path: "/home/runner/.cache/bazel"
9696
key: bazel-macos-13
@@ -102,3 +102,24 @@ jobs:
102102
# Test without bzlmod
103103
bazelisk build --noenable_bzlmod -- //...
104104
bazelisk test --noenable_bzlmod -- //...
105+
106+
build_and_test_macos_M1:
107+
name: macOS 14 Bazel build <Apple Clang14>
108+
runs-on: macos-14
109+
110+
steps:
111+
- uses: actions/checkout@v4.1.1
112+
113+
- name: Mount Bazel cache
114+
uses: actions/cache@v4.0.0
115+
with:
116+
path: "/home/runner/.cache/bazel"
117+
key: bazel-macos-14
118+
119+
- name: Build
120+
run: |
121+
bazelisk build //...
122+
bazelisk test //...
123+
# Test without bzlmod
124+
bazelisk build --noenable_bzlmod -- //...
125+
bazelisk test --noenable_bzlmod -- //...

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,4 @@ docs/_test_images/
5757

5858
# Ignore Bazel generated files
5959
bazel-*
60+
MODULE.bazel.lock

‎MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ module(
77
)
88

99
bazel_dep(name = "bazel_skylib", version = "1.5.0")
10-
bazel_dep(name = "imath", version = "3.1.9", repo_name = "Imath")
10+
bazel_dep(name = "imath", version = "3.1.10", repo_name = "Imath")
1111
bazel_dep(name = "libdeflate", version = "1.19")
1212
bazel_dep(name = "platforms", version = "0.0.8")

‎bazel/third_party/openexr_deps.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ def openexr_deps():
2222
http_archive,
2323
name = "Imath",
2424
build_file = "@com_openexr//:bazel/third_party/Imath.BUILD",
25-
strip_prefix = "Imath-3.1.9",
26-
sha256 = "f1d8aacd46afed958babfced3190d2d3c8209b66da451f556abd6da94c165cf3",
27-
urls = ["https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.1.9.tar.gz"],
25+
strip_prefix = "Imath-3.1.10",
26+
sha256 = "f2943e86bfb694e216c60b9a169e5356f8a90f18fbd34d7b6e3450be14f60b10",
27+
urls = ["https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.1.10.tar.gz"],
2828
)
2929

3030
maybe(

0 commit comments

Comments
 (0)