Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: Nomenclature change 'os' to 'runner' for clarity #4036

Merged
merged 1 commit into from
Nov 16, 2023
Merged

ci: Nomenclature change 'os' to 'runner' for clarity #4036

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 30 additions & 30 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
include:
- desc: gcc6/C++14 py2.7 boost1.66 exr2.4 ocio1.1
nametag: linux-vfx2019
os: ubuntu-latest
runner: ubuntu-latest
container: aswf/ci-osl:2019
vfxyear: 2019
cxx_std: 14
Expand All @@ -44,7 +44,7 @@ jobs:
setenvs: export PUGIXML_VERSION=v1.9 CMAKE_VERSION=3.15.5
- desc: gcc6/C++14 py3.7 boost1.70 exr2.4 ocio1.1
nametag: linux-vfx2020
os: ubuntu-latest
runner: ubuntu-latest
container: aswf/ci-osl:2020
vfxyear: 2020
cxx_std: 14
Expand All @@ -55,7 +55,7 @@ jobs:
setenvs: export PUGIXML_VERSION=v1.9 WEBP_VERSION=v1.1.0
- desc: gcc9/C++17 py3.7 boost1.73 exr2.5 ocio2.0
nametag: linux-vfx2021
os: ubuntu-latest
runner: ubuntu-latest
container: aswf/ci-osl:2021
vfxyear: 2021
cxx_std: 17
Expand All @@ -66,7 +66,7 @@ jobs:
setenvs: export PUGIXML_VERSION=v1.9 WEBP_VERSION=v1.1.0
- desc: clang10/C++14 avx2 exr2.5 ocio2.0
nametag: linux-clang10-cpp14
os: ubuntu-latest
runner: ubuntu-latest
container: aswf/ci-osl:2021-clang10
vfxyear: 2021
cc_compiler: clang
Expand All @@ -78,7 +78,7 @@ jobs:
fmt_ver: 8.1.1
- desc: gcc9/C++17 py39 boost1.76 exr3.1 ocio2.1
nametag: linux-vfx2022
os: ubuntu-latest
runner: ubuntu-latest
container: aswf/ci-osl:2022-clang11
vfxyear: 2022
cxx_std: 17
Expand All @@ -88,7 +88,7 @@ jobs:
pybind11_ver: v2.9.0
- desc: clang13/C++17 py39 avx2 exr3.1 ocio2.1
nametag: linux-vfx2022-clang13
os: ubuntu-latest
runner: ubuntu-latest
container: aswf/ci-osl:2022-clang13
vfxyear: 2022
cc_compiler: clang
Expand All @@ -100,7 +100,7 @@ jobs:
pybind11_ver: v2.8.1
- desc: icc/C++17 py3.9 boost1.76 exr3.1 ocio2.1 qt5.15
nametag: linux-vfx2022-icc
os: ubuntu-latest
runner: ubuntu-latest
container: aswf/ci-osl:2022
vfxyear: 2022
cxx_std: 17
Expand All @@ -115,7 +115,7 @@ jobs:
# that make test results differ from other platforms.
- desc: icx/C++17 py3.9 boost1.76 exr3.1 ocio2.1 qt5.15
nametag: linux-vfx2022-icx
os: ubuntu-latest
runner: ubuntu-latest
container: aswf/ci-osl:2022
vfxyear: 2022
cc_compiler: icx
Expand All @@ -127,7 +127,7 @@ jobs:
setenvs: export USE_OPENVDB=0
- desc: sanitizers
nametag: sanitizer
os: ubuntu-latest
runner: ubuntu-latest
container: aswf/ci-osl:2022-clang13
vfxyear: 2022
cc_compiler: clang
Expand All @@ -141,7 +141,7 @@ jobs:
CTEST_EXCLUSIONS="broken|png-damaged"
- desc: gcc11/C++17 py3.10 boost1.80 exr3.1 ocio2.2
nametag: linux-vfx2023
os: ubuntu-latest
runner: ubuntu-latest
container: aswftesting/ci-osl:2023-clang15
vfxyear: 2023
cxx_std: 17
Expand All @@ -153,7 +153,7 @@ jobs:
# Oldest versions of the dependencies that we can muster, and various
# things disabled (no SSE, OCIO, or OpenCV, don't embed plugins).
nametag: linux-oldest
os: ubuntu-latest
runner: ubuntu-latest
container: aswf/ci-osl:2019
vfxyear: 2019
cxx_std: 14
Expand All @@ -178,7 +178,7 @@ jobs:
# the console output).
- desc: "clang-format"
nametag: clang-format
os: ubuntu-latest
runner: ubuntu-latest
container: aswf/ci-osl:2022-clang12
vfxyear: 2022
cxx_std: 17
Expand All @@ -192,7 +192,7 @@ jobs:
# the current one, and compare the resulting libraries.
- desc: abi check
nametag: linux-vfx2023
os: ubuntu-latest
runner: ubuntu-latest
container: aswftesting/ci-osl:2023-clang15
vfxyear: 2023
cxx_std: 17
Expand All @@ -207,7 +207,7 @@ jobs:
USE_OPENCV=0 USE_FFMPEG=0 USE_PYTHON=0
CMAKE_BUILD_TYPE=RelWithDebInfo

runs-on: ${{ matrix.os }}
runs-on: ${{ matrix.runner }}
container:
image: ${{ matrix.container }}
env:
Expand Down Expand Up @@ -291,7 +291,7 @@ jobs:
include:
- desc: latest releases gcc11 C++17 avx2 exr3.2 ocio2.3
nametag: linux-latest-releases
os: ubuntu-22.04
runner: ubuntu-22.04
cc_compiler: gcc-11
cxx_compiler: g++-11
cxx_std: 17
Expand All @@ -312,7 +312,7 @@ jobs:
# The installed OpenVDB has a TLS conflict with Python 3.8
- desc: bleeding edge gcc12 C++20 py3.10 OCIO/libtiff/exr-master boost1.74 avx2
nametag: linux-bleeding-edge
os: ubuntu-22.04
runner: ubuntu-22.04
cc_compiler: gcc-12
cxx_compiler: g++-12
cxx_std: 20
Expand All @@ -334,7 +334,7 @@ jobs:
# The installed OpenVDB has a TLS conflict with Python 3.8
- desc: clang14 C++20 avx2 exr3.1 ocio2.1
nametag: linux-clang14
os: ubuntu-20.04
runner: ubuntu-20.04
cxx_compiler: clang++
cc_compiler: clang
cxx_std: 20
Expand All @@ -349,7 +349,7 @@ jobs:
# The installed OpenVDB has a TLS conflict with Python 3.8
- desc: debug gcc7/C++14, sse4.2, exr2.4
nametag: linux-gcc7-cpp14-debug
os: ubuntu-20.04
runner: ubuntu-20.04
container:
image: ubuntu-18.04
cxx_compiler: g++-7
Expand All @@ -364,7 +364,7 @@ jobs:

- desc: gcc8 C++17 avx exr2.5
nametag: linux-gcc8
os: ubuntu-20.04
runner: ubuntu-20.04
container:
image: ubuntu-18.04
cc_compiler: gcc-8
Expand All @@ -376,7 +376,7 @@ jobs:
setenvs: export EXTRA_DEP_PACKAGES=libjpeg-turbo8-dev
- desc: static libs gcc7 C++14 exr2.4
nametag: linux-static
os: ubuntu-20.04
runner: ubuntu-20.04
container:
image: ubuntu-18.04
cxx_compiler: g++-7
Expand All @@ -388,7 +388,7 @@ jobs:
sudo rm -rf /usr/local/include/OpenEXR
sudo rm -rf /usr/local/lib64/cmake/{IlmBase,OpenEXR}

runs-on: ${{ matrix.os }}
runs-on: ${{ matrix.runner }}
env:
CXX: ${{matrix.cxx_compiler}}
CC: ${{matrix.cc_compiler}}
Expand Down Expand Up @@ -443,34 +443,34 @@ jobs:
!build/testsuite/j2kp4files_v1_5


macos:
name: "${{matrix.os}} appleclang${{matrix.aclang}}/C++${{matrix.cxx_std}} py${{matrix.python_ver}} ${{matrix.desc}} boost1.76 exr3.1 ocio2.1"
macrunner:
name: "${{matrix.runner}} appleclang${{matrix.aclang}}/C++${{matrix.cxx_std}} py${{matrix.python_ver}} ${{matrix.desc}} boost1.76 exr3.1 ocio2.1"
strategy:
fail-fast: false
matrix:
include:
- desc: MacOS-11
os: macos-11
runner: macos-11
nametag: macos11-py39
cxx_std: 17
python_ver: "3.9"
aclang: 13
setenvs: export QT_VERSION=@5
- desc: MacOS-12
os: macos-12
runner: macos-12
nametag: macos12-py310
cxx_std: 20
python_ver: "3.10"
aclang: 13
setenvs: export CTEST_TEST_TIMEOUT=600
- desc: MacOS-13
os: macos-13
runner: macos-13
nametag: macos13-py311
cxx_std: 20
python_ver: "3.11"
aclang: 14
setenvs: export CTEST_TEST_TIMEOUT=600
runs-on: ${{ matrix.os }}
runs-on: ${{ matrix.runner }}
env:
CC: clang
CXX: clang++
Expand Down Expand Up @@ -522,21 +522,21 @@ jobs:
matrix:
include:
- desc: windows-2019
os: windows-2019
runner: windows-2019
vsver: 2019
generator: "Visual Studio 16 2019"
openexr_ver: v2.5.8
python_ver: 3.7
simd: sse4.2
# - desc: windows-2022
# os: windows-2022
# runner: windows-2022
# vsver: 2022
# generator: "Visual Studio 17 2022"
# openexr_ver: main
# # v3.1.4
# python_ver: 3.7
# simd: sse4.2
runs-on: ${{ matrix.os }}
runs-on: ${{ matrix.runner }}
env:
PYTHON_VERSION: ${{matrix.python_ver}}
CMAKE_GENERATOR: ${{matrix.generator}}
Expand Down
Loading