Skip to content

Commit 23fae8d

Browse files
committed
ci: We were not correctly setting fmt version from job options (#4939)
Ugh, used the wrong option name. Also, it's sufficient to just do it with the env variable, don't need extra logic in ci-build.bash. Signed-off-by: Larry Gritz <[email protected]>
1 parent e120a92 commit 23fae8d

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

.github/workflows/build-steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
CTEST_ARGS: ${{inputs.ctest_args}}
9595
CTEST_TEST_TIMEOUT: ${{inputs.ctest_test_timeout}}
9696
USE_SIMD: ${{inputs.simd}}
97-
FMT_VERSION: ${{inputs.fmt_ver}}
97+
fmt_BUILD_VERSION: ${{inputs.fmt_ver}}
9898
OPENCOLORIO_VERSION: ${{inputs.opencolorio_ver}}
9999
OPENEXR_VERSION: ${{inputs.openexr_ver}}
100100
PYBIND11_VERSION: ${{inputs.pybind11_ver}}

src/build-scripts/ci-build.bash

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ if [[ "$USE_SIMD" != "" ]] ; then
1818
OIIO_CMAKE_FLAGS="$OIIO_CMAKE_FLAGS -DUSE_SIMD=$USE_SIMD"
1919
fi
2020

21-
if [[ -n "$FMT_VERSION" ]] ; then
22-
OIIO_CMAKE_FLAGS="$OIIO_CMAKE_FLAGS -DBUILD_FMT_VERSION=$FMT_VERSION"
23-
fi
24-
2521
if [[ -n "$CODECOV" ]] ; then
2622
OIIO_CMAKE_FLAGS="$OIIO_CMAKE_FLAGS -DCODECOV=${CODECOV}"
2723
fi

0 commit comments

Comments
 (0)