Skip to content

Commit

Permalink
CI Workflows various fixes
Browse files Browse the repository at this point in the history 
Signed-off-by: Rémi Achard <[email protected]>
  • Loading branch information
@remia
remia committed Feb 25, 2024
1 parent 184566e commit 3c6a5fe
Show file tree
Hide file tree
Showing 9 changed files with 212 additions and 158 deletions.
12 changes: 7 additions & 5 deletions .github/workflows/analysis_workflow.yml
View file
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
View file
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
94 changes: 47 additions & 47 deletions .github/workflows/ci_workflow.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
# ---------------------------------------------------------------------------

linux:
name: 'Linux CentOS 7 VFX CY${{ matrix.vfx-cy }}
name: 'Linux VFX CY${{ matrix.vfx-cy }}
<${{ matrix.compiler-desc }}
config=${{ matrix.build-type }},
shared=${{ matrix.build-shared }},
Expand All @@ -52,7 +52,7 @@ jobs:
if: |
github.event_name == 'push' ||
github.event.pull_request.head.repo.full_name != github.repository
# 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
Expand All @@ -63,7 +63,7 @@ jobs:
build: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
include:
# -------------------------------------------------------------------
# VFX CY2023 (Python 3.10)
# VFX CY2024 (Python 3.11)
# -------------------------------------------------------------------
- build: 12
build-type: Debug
Expand All @@ -76,7 +76,7 @@ jobs:
cxx-compiler: clang++
cc-compiler: clang
compiler-desc: Clang
vfx-cy: 2023
vfx-cy: 2024
install-ext-packages: MISSING
- build: 11
build-type: Release
Expand All @@ -89,7 +89,7 @@ jobs:
cxx-compiler: g++
cc-compiler: gcc
compiler-desc: GCC
vfx-cy: 2023
vfx-cy: 2024
install-ext-packages: ALL
- build: 10
build-type: Release
Expand All @@ -102,10 +102,10 @@ jobs:
cxx-compiler: g++
cc-compiler: gcc
compiler-desc: GCC
vfx-cy: 2023
vfx-cy: 2024
install-ext-packages: ALL
# -------------------------------------------------------------------
# VFX CY2022 (Python 3.9)
# VFX CY2023 (Python 3.10)
# -------------------------------------------------------------------
- build: 9
build-type: Debug
Expand All @@ -118,8 +118,8 @@ jobs:
cxx-compiler: clang++
cc-compiler: clang
compiler-desc: Clang
vfx-cy: 2022
install-ext-packages: ALL
vfx-cy: 2023
install-ext-packages: MISSING
- build: 8
build-type: Release
build-shared: 'ON'
Expand All @@ -131,8 +131,8 @@ jobs:
cxx-compiler: g++
cc-compiler: gcc
compiler-desc: GCC
vfx-cy: 2022
install-ext-packages: MISSING
vfx-cy: 2023
install-ext-packages: ALL
- build: 7
build-type: Release
build-shared: 'OFF'
Expand All @@ -144,40 +144,40 @@ jobs:
cxx-compiler: g++
cc-compiler: gcc
compiler-desc: GCC
vfx-cy: 2022
vfx-cy: 2023
install-ext-packages: ALL
# -------------------------------------------------------------------
# VFX CY2021 (Python 3.7)
# VFX CY2022 (Python 3.9)
# -------------------------------------------------------------------
- build: 6
build-type: Release
build-type: Debug
build-shared: 'ON'
build-docs: 'OFF'
build-openfx: 'OFF'
build-openfx: 'ON'
use-simd: 'ON'
use-oiio: 'ON'
cxx-standard: 17
cxx-compiler: clang++
cc-compiler: clang
compiler-desc: Clang
vfx-cy: 2021
install-ext-packages: MISSING
vfx-cy: 2022
install-ext-packages: ALL
- build: 5
build-type: Release
build-shared: 'OFF'
build-docs: 'OFF'
build-shared: 'ON'
build-docs: 'ON'
build-openfx: 'ON'
use-simd: 'OFF'
use-oiio: 'OFF'
cxx-standard: 14
cxx-compiler: clang++
cc-compiler: clang
compiler-desc: Clang
vfx-cy: 2021
install-ext-packages: ALL
cxx-standard: 17
cxx-compiler: g++
cc-compiler: gcc
compiler-desc: GCC
vfx-cy: 2022
install-ext-packages: MISSING
- build: 4
build-type: Debug
build-shared: 'ON'
build-type: Release
build-shared: 'OFF'
build-docs: 'OFF'
build-openfx: 'OFF'
use-simd: 'ON'
Expand All @@ -186,39 +186,39 @@ jobs:
cxx-compiler: g++
cc-compiler: gcc
compiler-desc: GCC
vfx-cy: 2021
vfx-cy: 2022
install-ext-packages: ALL
# -------------------------------------------------------------------
# VFX CY2020 (Python 3.7)
# VFX CY2021 (Python 3.7)
# -------------------------------------------------------------------
- build: 3
build-type: Release
build-shared: 'ON'
build-docs: 'OFF'
build-openfx: 'ON'
use-simd: 'OFF'
use-oiio: 'OFF'
cxx-standard: 14
build-openfx: 'OFF'
use-simd: 'ON'
use-oiio: 'ON'
cxx-standard: 17
cxx-compiler: clang++
cc-compiler: clang
compiler-desc: Clang
vfx-cy: 2020
vfx-cy: 2021
install-ext-packages: MISSING
- build: 2
build-type: Debug
build-type: Release
build-shared: 'OFF'
build-docs: 'OFF'
build-openfx: 'ON'
use-simd: 'ON'
use-oiio: 'ON'
use-simd: 'OFF'
use-oiio: 'OFF'
cxx-standard: 14
cxx-compiler: g++
cc-compiler: gcc
compiler-desc: GCC
vfx-cy: 2020
cxx-compiler: clang++
cc-compiler: clang
compiler-desc: Clang
vfx-cy: 2021
install-ext-packages: ALL
- build: 1
build-type: Release
build-type: Debug
build-shared: 'ON'
build-docs: 'OFF'
build-openfx: 'OFF'
Expand All @@ -228,7 +228,7 @@ jobs:
cxx-compiler: g++
cc-compiler: gcc
compiler-desc: GCC
vfx-cy: 2020
vfx-cy: 2021
install-ext-packages: ALL
env:
CXX: ${{ matrix.cxx-compiler }}
Expand Down 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
View file
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
Loading

0 comments on commit 3c6a5fe

Please sign in to comment.