Skip to content

Commit

Permalink
Remove references to python and boost from ci workflow
Browse files Browse the repository at this point in the history 
Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>
  • Loading branch information
@kdt3rd
kdt3rd committed Nov 7, 2020
1 parent d146537 commit cc7b31a
Showing 1 changed file with 117 additions and 136 deletions.
253 changes: 117 additions & 136 deletions .github/workflows/ci_workflow.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,27 +60,27 @@ jobs:
# -------------------------------------------------------------------
# GCC, VFX CY2020
# -------------------------------------------------------------------
# C++11, Python 3.7
# Shared, Release
- build: 1
build-type: Release
build-shared: 'ON'
cxx-standard: 11
cxx-standard: 14
cxx-compiler: g++
cc-compiler: gcc
compiler-desc: GCC 6.3.1
vfx-cy: 2020
exclude-tests: -E PyIlmBase.*_Python2
# Debug
exclude-tests:
# Shared, Debug
- build: 2
build-type: Debug
build-shared: 'ON'
cxx-standard: 11
cxx-standard: 14
cxx-compiler: g++
cc-compiler: gcc
compiler-desc: GCC 6.3.1
vfx-cy: 2020
exclude-tests: -E PyIlmBase.*_Python2
# C++14
exclude-tests:
# Static, Release
- build: 3
build-type: Release
build-shared: 'ON'
Expand All @@ -89,25 +89,25 @@ jobs:
cc-compiler: gcc
compiler-desc: GCC 6.3.1
vfx-cy: 2020
exclude-tests: -E PyIlmBase.*_Python2
# Static
exclude-tests:
# Static, Debug
- build: 4
build-type: Release
build-type: Debug
build-shared: 'OFF'
cxx-standard: 11
cxx-standard: 14
cxx-compiler: g++
cc-compiler: gcc
compiler-desc: GCC 6.3.1
vfx-cy: 2020
exclude-tests: -E PyIlmBase.*_Python2
exclude-tests:
# -------------------------------------------------------------------
# GCC, VFX CY2019
# -------------------------------------------------------------------
# Python 2.7
#
- build: 5
build-type: Release
build-shared: 'ON'
cxx-standard: 11
cxx-standard: 14
cxx-compiler: g++
cc-compiler: gcc
compiler-desc: GCC 6.3.1
Expand All @@ -116,27 +116,27 @@ jobs:
# -------------------------------------------------------------------
# Clang, VFX CY2020
# -------------------------------------------------------------------
# C++11, Python 3.7
# Release
- build: 6
build-type: Release
build-shared: 'ON'
cxx-standard: 11
cxx-standard: 14
cxx-compiler: clang++
cc-compiler: clang
compiler-desc: Clang 7
vfx-cy: 2020
exclude-tests: -E PyIlmBase.*_Python2
exclude-tests:
# Debug
- build: 7
build-type: Debug
build-shared: 'ON'
cxx-standard: 11
cxx-standard: 14
cxx-compiler: clang++
cc-compiler: clang
compiler-desc: Clang 7
vfx-cy: 2020
exclude-tests: -E PyIlmBase.*_Python2
# C++14
exclude-tests:
# Static, Release
- build: 8
build-type: Release
build-shared: 'ON'
Expand All @@ -145,25 +145,25 @@ jobs:
cc-compiler: clang
compiler-desc: Clang 7
vfx-cy: 2020
exclude-tests: -E PyIlmBase.*_Python2
# Static
exclude-tests:
# Static, Debug
- build: 9
build-type: Release
build-type: Debug
build-shared: 'OFF'
cxx-standard: 11
cxx-standard: 14
cxx-compiler: clang++
cc-compiler: clang
compiler-desc: Clang 7
vfx-cy: 2020
exclude-tests: -E PyIlmBase.*_Python2
exclude-tests:
# -------------------------------------------------------------------
# Clang, VFX CY2019
# -------------------------------------------------------------------
# Python 2.7
#
- build: 10
build-type: Release
build-shared: 'ON'
cxx-standard: 11
cxx-standard: 14
cxx-compiler: clang++
cc-compiler: clang
compiler-desc: Clang 7
Expand Down Expand Up @@ -219,68 +219,54 @@ jobs:
config=${{ matrix.build-type }},
shared=${{ matrix.build-shared }},
cxx=${{ matrix.cxx-standard }},
python=${{ matrix.python-version }},
docs=${{ matrix.build-docs }}>'
runs-on: macos-10.15
strategy:
matrix:
build: [1, 2, 3, 4, 5]
include:
# C++11, Python 3.7
# C++11, Release
- build: 1
build-type: Release
build-shared: 'ON'
build-docs: 'ON'
cxx-standard: 11
python-version: 3.7
exclude-tests: -E PyIlmBase.*_Python3
exclude-tests:
# Debug
- build: 2
build-type: Debug
build-shared: 'ON'
build-docs: 'OFF'
cxx-standard: 11
python-version: 3.7
exclude-tests: -E PyIlmBase.*_Python3
exclude-tests:
# C++14
- build: 3
build-type: Release
build-shared: 'ON'
build-docs: 'OFF'
cxx-standard: 14
python-version: 3.7
exclude-tests: -E PyIlmBase.*_Python3
exclude-tests:
# Static
- build: 4
build-type: Release
build-shared: 'OFF'
build-docs: 'OFF'
cxx-standard: 11
python-version: 3.7
exclude-tests: -E "PyIlmBase.*_Python3|PyIlmBase.PyImathTest_Python2"
# Python 2.7
cxx-standard: 14
exclude-tests:
# Static, Debug
- build: 5
build-type: Release
build-shared: 'ON'
build-docs: 'ON'
cxx-standard: 11
python-version: 2.7
exclude-tests: -E PyIlmBase.*_Python3
build-docs: 'OFF'
cxx-standard: 14
exclude-tests:
steps:
- name: Setup Python
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python-version }}
- name: Checkout
uses: actions/checkout@v2
- name: Create build directories
run: |
mkdir _install
mkdir _build
- name: Install Dependences
run: |
share/ci/scripts/macos/install_boost.sh
shell: bash
- name: Configure
run: |
cmake ../. \
Expand All @@ -291,9 +277,7 @@ jobs:
-DCMAKE_VERBOSE_MAKEFILE:BOOL='OFF' \
-DBUILD_SHARED_LIBS=${{ matrix.build-shared }} \
-DOPENEXR_BUILD_UTILS='ON' \
-DOPENEXR_RUN_FUZZ_TESTS='OFF' \
-DPYTHON_EXECUTABLE=$(which python) \
-DBoost_NO_BOOST_CMAKE=ON
-DOPENEXR_RUN_FUZZ_TESTS='OFF'
working-directory: _build
- name: Build
run: |
Expand All @@ -314,38 +298,45 @@ jobs:
# ---------------------------------------------------------------------------
# Windows
# ---------------------------------------------------------------------------
# TODO: Figure out how to get CMake to use Python 3.7.7.
# Boost 1.70.0 will only make boost python for 3.7.
# CMake finds Python 3.8 on the VM when configuring, then does not find
# a corresponding boost python38 module. As a result PyIlmbase tests are not
# built or run.
# TODO: Determine why tests hang in Debug job.
# TODO: Fix boost script to install from sourceforge.

# windows:
# name: 'Windows 2019
# <MSVC 16.4
# config=${{ matrix.build-type }},
# shared=${{ matrix.build-shared }},
# cxx=${{ matrix.cxx-standard }},
# python=${{ matrix.python-version }},
# docs=${{ matrix.build-docs }}>'
# runs-on: windows-2019
# strategy:
# matrix:
# build: [1, 3, 4]
# include:
windows:
name: 'Windows 2019
<MSVC 16.4
config=${{ matrix.build-type }},
shared=${{ matrix.build-shared }},
cxx=${{ matrix.cxx-standard }},
docs=${{ matrix.build-docs }}>'
runs-on: windows-2019
strategy:
matrix:
build: [1, 2, 3, 4]
include:
# # C++11, Python 3.7
# - build: 1
# build-type: Release
# build-shared: 'ON'
# build-docs: 'ON'
# cxx-standard: 11
# python-version: 3.7.7
# boost-version: 1.70.0
# zlib-version: 1.2.11
# zlib-lib: zlib.lib
# exclude-tests: ''
- build: 1
build-type: Release
build-shared: 'ON'
build-docs: 'ON'
cxx-standard: 11
exclude-tests: ''
- build: 2
build-type: Debug
build-shared: 'ON'
build-docs: 'ON'
cxx-standard: 11
exclude-tests: ''
- build: 3
build-type: Release
build-shared: 'ON'
build-docs: 'ON'
cxx-standard: 14
exclude-tests: ''
- build: 4
build-type: Debug
build-shared: 'ON'
build-docs: 'ON'
cxx-standard: 14
exclude-tests: ''
# # Debug -
# # - build: 2
# # build-type: Debug
Expand Down Expand Up @@ -380,56 +371,46 @@ jobs:
# zlib-lib: zlibstatic.lib
# exclude-tests: ''

# steps:
# - name: Setup Python
# uses: actions/setup-python@v1
# with:
# python-version: ${{ matrix.python-version }}
# - name: Checkout
# uses: actions/checkout@v2
# - name: Create build directories
# run: |
# mkdir _install
# mkdir _build
# shell: bash
# - name: Install Dependences
# run: |
# share/ci/scripts/windows/install_python.ps1 ${{ matrix.python-version }} $HOME
# share/ci/scripts/windows/install_boost.ps1 ${{ matrix.boost-version }} $HOME 3.8
# share/ci/scripts/windows/install_zlib.ps1 ${{ matrix.zlib-version }} $HOME
# shell: powershell
# - name: Configure
# run: |
# cmake ../. \
# -DCMAKE_INSTALL_PREFIX=../_install \
# -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} \
# -DCMAKE_CXX_STANDARD=${{ matrix.cxx-standard }} \
# -DCMAKE_CXX_FLAGS=${{ matrix.cxx-flags }} \
# -DCMAKE_VERBOSE_MAKEFILE:BOOL='OFF' \
# -DBOOST_ROOT:FILEPATH=$BOOST_ROOT \
# -DZLIB_ROOT:FILEPATH="$ZLIB_ROOT" \
# -DZLIB_LIBRARY:FILEPATH="$ZLIB_ROOT/lib/${{ matrix.zlib-lib }}" \
# -DBUILD_SHARED_LIBS=${{ matrix.build-shared }} \
# -DOPENEXR_BUILD_UTILS='ON' \
# -DOPENEXR_RUN_FUZZ_TESTS='OFF'
# # -DPython_EXECUTABLE:FILEPATH="$PYTHON_ROOT" \
# # -DPython_INCLUDE_DIR:FILEPATH="$PYTHON_ROOT/include" \
# # -DPython_LIBRARY:"$PYTHON_ROOT\libs" \
# shell: bash
# working-directory: _build
# - name: Build
# run: |
# cmake --build . \
# --target install \
# --config ${{ matrix.build-type }}
# shell: bash
# working-directory: _build
# - name: Test
# run: |
# ctest -T Test ${{ matrix.exclude-tests }} \
# -C ${{ matrix.build-type }} \
# --timeout 7200 \
# --output-on-failure \
# -VV
# shell: bash
# working-directory: _build
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Create build directories
run: |
mkdir _install
mkdir _build
shell: bash
## - name: Install Dependences
## run: |
## share/ci/scripts/windows/install_python.ps1 ${{ matrix.python-version }} $HOME
## share/ci/scripts/windows/install_boost.ps1 ${{ matrix.boost-version }} $HOME 3.8
## share/ci/scripts/windows/install_zlib.ps1 ${{ matrix.zlib-version }} $HOME
## shell: powershell
- name: Configure
run: |
cmake ../. \
-DCMAKE_INSTALL_PREFIX=../_install \
-DCMAKE_BUILD_TYPE=${{ matrix.build-type }} \
-DCMAKE_CXX_STANDARD=${{ matrix.cxx-standard }} \
-DCMAKE_CXX_FLAGS=${{ matrix.cxx-flags }} \
-DCMAKE_VERBOSE_MAKEFILE:BOOL='OFF' \
-DBUILD_SHARED_LIBS=${{ matrix.build-shared }} \
-DOPENEXR_BUILD_UTILS='ON' \
-DOPENEXR_RUN_FUZZ_TESTS='OFF'
shell: bash
working-directory: _build
- name: Build
run: |
cmake --build . \
--target install \
--config ${{ matrix.build-type }}
shell: bash
working-directory: _build
- name: Test
run: |
ctest -T Test ${{ matrix.exclude-tests }} \
-C ${{ matrix.build-type }} \
--timeout 7200 \
--output-on-failure \
-VV
shell: bash
working-directory: _build

0 comments on commit cc7b31a

Please sign in to comment.