Skip to content

Commit 1b86a2f

Browse files
authored
add native rawtoaces CI runners (#213)
Signed-off-by: Anton Dukhovnikov <antond@wetafx.co.nz>
1 parent 95c4612 commit 1b86a2f

File tree

2 files changed

+26
-7
lines changed

2 files changed

+26
-7
lines changed

.github/workflows/build-steps.yml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ on:
2828
type: string
2929
default: 'ON'
3030
vfxyear:
31-
type: string
32-
default: '0'
31+
type: number
32+
default: 0
3333
ceres_hack:
3434
type: string
3535
default: 'OFF'
@@ -54,7 +54,7 @@ jobs:
5454
steps:
5555

5656
- name: Install nodejs20glibc2.17 - VFX2022 only
57-
if: inputs.vfxyear == '2022'
57+
if: inputs.vfxyear == 2022
5858
run: |
5959
curl --silent https://unofficial-builds.nodejs.org/download/release/v20.18.1/node-v20.18.1-linux-x64-glibc-217.tar.xz | tar -xJ --strip-components 1 -C /node20217 -f -
6060
@@ -63,17 +63,26 @@ jobs:
6363
fetch-depth: '0'
6464

6565
- name: Yum config - VFX2022 only
66-
if: inputs.vfxyear == '2022'
66+
if: inputs.vfxyear == 2022
6767
shell: bash
6868
run: |
6969
yum-config-manager --disable centos-sclo-rh || true
7070
sed -i 's,^mirrorlist=,#,; s,^#baseurl=http://mirror\.centos\.org/centos/$releasever,baseurl=https://vault.centos.org/7.9.2009,' /etc/yum.repos.d/CentOS-Base.repo
7171
7272
- name: Dependencies
73+
if: inputs.vfxyear < 2024
7374
shell: bash
7475
run: |
7576
build_scripts/${{ inputs.install_deps }}.bash
76-
77+
78+
- name: Dependencies (aswf/ci-rawtoaces)
79+
if: inputs.vfxyear > 2023
80+
shell: bash
81+
run: |
82+
conan profile detect --force
83+
conan install --requires=nlohmann_json/3.12.0 --requires=nanobind/2.9.2 --generator CMakeDeps --generator CMakeToolchain --output-folder=build_deps --build=missing
84+
python -m pip install pytest
85+
7786
- name: Configure CMake
7887
run: >
7988
cmake
@@ -82,6 +91,7 @@ jobs:
8291
-D RTA_CENTOS7_CERES_HACK=${{ inputs.ceres_hack }}
8392
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/install
8493
-D CMAKE_CXX_STANDARD=17
94+
-D CMAKE_BUILD_TYPE=${{ inputs.build_type }}
8595
-D CMAKE_TOOLCHAIN_FILE="${{ inputs.toolchain_file }}"
8696
-D ENABLE_SHARED="${{ inputs.build_shared_libs }}"
8797
@@ -110,6 +120,7 @@ jobs:
110120
-D RAWTOACES_DIR=${{ github.workspace }}/install/lib/cmake/RAWTOACES
111121
-D CMAKE_TOOLCHAIN_FILE="${{ inputs.toolchain_file }}"
112122
-D CMAKE_CXX_STANDARD=17
123+
-D CMAKE_BUILD_TYPE=${{ inputs.build_type }}
113124
114125
- name: Build config_tests
115126
if: inputs.test_install == 'ON'

.github/workflows/ci.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,14 @@ jobs:
2323
vfxyear: ${{ matrix.vfxyear || 0 }}
2424
ceres_hack: ${{ matrix.ceres_hack || 'OFF' }}
2525
test_install: ${{ matrix.test_install || 'ON' }}
26+
toolchain_file: ${{ matrix.toolchain_file }}
2627

2728
strategy:
2829
# Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable.
2930
fail-fast: false
3031

3132
matrix:
32-
vfxyear: [ 2022, 2023, 2024 ]
33+
vfxyear: [ 2022, 2023, 2024, 2025, 2026 ]
3334
compiler: [ [gcc, g++], [clang, clang++] ]
3435
include:
3536
- vfxyear: 2022
@@ -40,7 +41,14 @@ jobs:
4041
- vfxyear: 2023
4142
container: aswf/ci-osl:2023-clang15
4243
- vfxyear: 2024
43-
container: aswf/ci-osl:2024-clang17
44+
container: aswf/ci-rawtoaces:2024.4
45+
toolchain_file: "/__w/rawtoaces/rawtoaces/build_deps/conan_toolchain.cmake"
46+
- vfxyear: 2025
47+
container: aswf/ci-rawtoaces:2025.3
48+
toolchain_file: "/__w/rawtoaces/rawtoaces/build_deps/conan_toolchain.cmake"
49+
- vfxyear: 2026
50+
container: aswf/ci-rawtoaces:2026.1
51+
toolchain_file: "/__w/rawtoaces/rawtoaces/build_deps/conan_toolchain.cmake"
4452

4553
build:
4654
name: "${{matrix.os}} ${{matrix.c_compiler}}"

0 commit comments

Comments
 (0)