Skip to content

Commit

Permalink
Bazel support: Bump Imath to 3.1.10 (AcademySoftwareFoundation#1626)
Browse files Browse the repository at this point in the history
Signed-off-by: Vertexwahn <julian.amann@tum.de>
  • Loading branch information
Vertexwahn committed Feb 7, 2024
1 parent 46944c3 commit 47f7cd2
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.0.0
7.0.2
33 changes: 27 additions & 6 deletions .github/workflows/bazel_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4.1.1

- name: Mount Bazel cache
uses: actions/cache@v3
uses: actions/cache@v4.0.0
with:
path: "/home/runner/.cache/bazel"
key: bazel-ubuntu-22
Expand All @@ -66,10 +66,10 @@ jobs:
runs-on: windows-2022

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4.1.1

- name: Mount Bazel cache
uses: actions/cache@v3
uses: actions/cache@v4.0.0
with:
path: "/home/runner/.cache/bazel"
key: bazel-windows-2022
Expand All @@ -87,10 +87,10 @@ jobs:
runs-on: macos-13

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4.1.1

- name: Mount Bazel cache
uses: actions/cache@v3
uses: actions/cache@v4.0.0
with:
path: "/home/runner/.cache/bazel"
key: bazel-macos-13
Expand All @@ -102,3 +102,24 @@ jobs:
# Test without bzlmod
bazelisk build --noenable_bzlmod -- //...
bazelisk test --noenable_bzlmod -- //...
build_and_test_macos_M1:
name: macOS 14 Bazel build <Apple Clang14>
runs-on: macos-14

steps:
- uses: actions/checkout@v4.1.1

- name: Mount Bazel cache
uses: actions/cache@v4.0.0
with:
path: "/home/runner/.cache/bazel"
key: bazel-macos-14

- name: Build
run: |
bazelisk build //...
bazelisk test //...
# Test without bzlmod
bazelisk build --noenable_bzlmod -- //...
bazelisk test --noenable_bzlmod -- //...
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,4 @@ docs/_test_images/

# Ignore Bazel generated files
bazel-*
MODULE.bazel.lock
2 changes: 1 addition & 1 deletion MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ module(
)

bazel_dep(name = "bazel_skylib", version = "1.5.0")
bazel_dep(name = "imath", version = "3.1.9", repo_name = "Imath")
bazel_dep(name = "imath", version = "3.1.10", repo_name = "Imath")
bazel_dep(name = "libdeflate", version = "1.19")
bazel_dep(name = "platforms", version = "0.0.8")
6 changes: 3 additions & 3 deletions bazel/third_party/openexr_deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ def openexr_deps():
http_archive,
name = "Imath",
build_file = "@com_openexr//:bazel/third_party/Imath.BUILD",
strip_prefix = "Imath-3.1.9",
sha256 = "f1d8aacd46afed958babfced3190d2d3c8209b66da451f556abd6da94c165cf3",
urls = ["https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.1.9.tar.gz"],
strip_prefix = "Imath-3.1.10",
sha256 = "f2943e86bfb694e216c60b9a169e5356f8a90f18fbd34d7b6e3450be14f60b10",
urls = ["https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.1.10.tar.gz"],
)

maybe(
Expand Down

0 comments on commit 47f7cd2

Please sign in to comment.