Skip to content

Commit

Permalink
CI Workflows various fixes (#1945)
Browse files Browse the repository at this point in the history
* Fix OSL 1.13 unit tests

Signed-off-by: Rémi Achard <remiachard@gmail.com>

* Update GHA deprecated actions

Signed-off-by: Rémi Achard <remiachard@gmail.com>

* Update sonnar-scanner version

Signed-off-by: Rémi Achard <remiachard@gmail.com>

* Upgrade platform latest to C++23 and fix Pybind11 asserts

Signed-off-by: Rémi Achard <remiachard@gmail.com>

---------

Signed-off-by: Rémi Achard <remiachard@gmail.com>
  • Loading branch information
remia committed Mar 12, 2024
1 parent 184566e commit 9fe81cb
Show file tree
Hide file tree
Showing 10 changed files with 169 additions and 127 deletions.
12 changes: 7 additions & 5 deletions .github/workflows/analysis_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,23 +27,25 @@ jobs:
# ---------------------------------------------------------------------------

linux_sonarcloud:
name: 'Linux CentOS 7 VFX CY2022 SonarCloud <GCC 9.3.1>'
name: 'Linux VFX CY2023 SonarCloud'
# Don't run on OCIO forks
if: github.repository == 'AcademySoftwareFoundation/OpenColorIO'
# GH-hosted VM. The build runs in CentOS 7 'container' defined below.
# GH-hosted VM. The build runs in ASWF 'container' defined below.
runs-on: ubuntu-latest
container:
# DockerHub: https://hub.docker.com/u/aswf
# Source: https://github.com/AcademySoftwareFoundation/aswf-docker
image: aswf/ci-ocio:2022
image: aswf/ci-ocio:2023
env:
CXX: g++
CC: gcc
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 50
- name: Install sonar-scanner and build-wrapper
uses: sonarsource/sonarcloud-github-c-cpp@v2
- name: Install docs env
run: share/ci/scripts/linux/yum/install_docs_env.sh
- name: Install tests env
Expand Down Expand Up @@ -79,4 +81,4 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: sonar-scanner -X -Dsonar.login=$SONAR_TOKEN
run: sonar-scanner
4 changes: 2 additions & 2 deletions .github/workflows/ci-macarm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@ jobs:
python-version: '3.11'
steps:
- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install docs env
run: share/ci/scripts/macos/install_docs_env.sh
if: matrix.build-docs == 'ON'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -388,11 +388,11 @@ jobs:
python-version: '3.7'
steps:
- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install docs env
run: share/ci/scripts/macos/install_docs_env.sh
if: matrix.build-docs == 'ON'
Expand Down Expand Up @@ -533,11 +533,11 @@ jobs:
python-version: '3.7'
steps:
- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install docs env
run: |
DOXYGEN_PATH=$GITHUB_WORKSPACE/doxygen
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/dependencies_latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -189,11 +189,11 @@ jobs:
use-oiio: 'OFF'
steps:
- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install docs env
run: share/ci/scripts/macos/install_docs_env.sh
if: matrix.build-docs == 'ON'
Expand Down Expand Up @@ -294,11 +294,11 @@ jobs:
use-oiio: 'OFF'
steps:
- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install docs env
run: |
DOXYGEN_PATH=$GITHUB_WORKSPACE/doxygen
Expand Down
62 changes: 32 additions & 30 deletions .github/workflows/platform_latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
build: [1, 2, 3, 4]
build: [1, 2]
include:
# -------------------------------------------------------------------
# GCC
Expand All @@ -46,7 +46,7 @@ jobs:
build-python: ON
build-type: Release
build-shared: ON
cxx-standard: 20
cxx-standard: 23
cxx-compiler: g++
cc-compiler: gcc
compiler-desc: GCC
Expand All @@ -55,38 +55,40 @@ jobs:
build-python: OFF
build-type: Debug
build-shared: ON
cxx-standard: 20
cxx-standard: 23
cxx-compiler: g++
cc-compiler: gcc
compiler-desc: GCC
enable-sanitizer: ON
# -------------------------------------------------------------------
# Clang
# -------------------------------------------------------------------
- build: 3
build-python: ON
build-type: Release
build-shared: ON
cxx-standard: 20
cxx-compiler: clang++
cc-compiler: clang
compiler-desc: Clang
enable-sanitizer: OFF
- build: 4
build-python: OFF
build-type: Debug
build-shared: ON
cxx-standard: 20
cxx-compiler: clang++
cc-compiler: clang
compiler-desc: Clang
enable-sanitizer: ON
# TODO: Re-enable clang when the following issue get fixed:
# https://github.com/actions/runner-images/issues/8659
# - build: 3
# build-python: ON
# build-type: Release
# build-shared: ON
# cxx-standard: 23
# cxx-compiler: clang++
# cc-compiler: clang
# compiler-desc: Clang
# enable-sanitizer: OFF
# - build: 4
# build-python: OFF
# build-type: Debug
# build-shared: ON
# cxx-standard: 23
# cxx-compiler: clang++
# cc-compiler: clang
# compiler-desc: Clang
# enable-sanitizer: ON
env:
CXX: ${{ matrix.cxx-compiler }}
CC: ${{ matrix.cc-compiler }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install tests env
run: share/ci/scripts/linux/yum/install_tests_env.sh
- name: Create build directories
Expand Down Expand Up @@ -185,23 +187,23 @@ jobs:
build-python: ON
build-type: Release
build-shared: ON
cxx-standard: 20
cxx-standard: 23
enable-sanitizer: OFF
python-version: '3.11'
- build: 2
build-python: OFF
build-type: Debug
build-shared: ON
cxx-standard: 20
cxx-standard: 23
enable-sanitizer: ON
python-version: '3.11'
steps:
- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install tests env
run: share/ci/scripts/macos/install_tests_env.sh
- name: Create build directories
Expand Down Expand Up @@ -298,21 +300,21 @@ jobs:
build-python: ON
build-type: Release
build-shared: ON
cxx-standard: 20
cxx-standard: 23
python-version: '3.11'
- build: 2
build-python: ON
build-type: Debug
build-shared: ON
cxx-standard: 20
cxx-standard: 23
python-version: '3.11'
steps:
- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install tests env
run: share/ci/scripts/windows/install_tests_env.sh
shell: bash
Expand Down

0 comments on commit 9fe81cb

Please sign in to comment.