oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

docker: Set C++17 for OTIO

Browse Source
This commit is contained in:
Simran Spiller
2022-05-12 23:28:37 +02:00
parent b153834878
commit b42c57acac
5 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci.yml
+1 -1
View File
@@ -50,7 +50,7 @@ jobs:
${{ matrix.cmake-gen }}>
runs-on: ubuntu-latest
container:
image: olivevideoeditor/ci-olive:2022.1
image: olivevideoeditor/ci-olive:2022.2
steps:
- name: Checkout Source Code
docker/README.md
+6 -6
View File
@@ -27,14 +27,14 @@ docker pull olivevideoeditor/ci-package-otio:0.14.1
docker pull olivevideoeditor/ci-package-crashpad
docker pull olivevideoeditor/ci-package-ffmpeg:5.0
docker pull olivevideoeditor/ci-package-ocio:2022-2.1.1
docker pull olivevideoeditor/ci-olive:2022.1
docker pull olivevideoeditor/ci-olive:2022.2
```
Use `ci-olive` image as local build container, by mounting working copy at
`~/olive` into guest system at `/opt/olive/olive`:
```bash
docker run --rm -it -v ~/olive:/opt/olive/olive olivevideoeditor/ci-olive:2022.1
docker run --rm -it -v ~/olive:/opt/olive/olive olivevideoeditor/ci-olive:2022.2
mkdir build
cd build
cmake .. -G Ninja
@@ -50,11 +50,11 @@ docker build -t olivevideoeditor/ci-package-otio:0.14.1 -f ci-otio/Dockerfile .
docker build -t olivevideoeditor/ci-package-crashpad -f ci-crashpad/Dockerfile .
docker build -t olivevideoeditor/ci-package-ffmpeg:5.0 -f ci-ffmpeg/Dockerfile .
docker build -t olivevideoeditor/ci-package-ocio:2022-2.1.1 -f ci-ocio/Dockerfile .
docker build -t olivevideoeditor/ci-olive:2022.1 -f ci-olive/Dockerfile .
docker build -t olivevideoeditor/ci-olive:2022.2 -f ci-olive/Dockerfile .
```
Note that `2022` in `ci-olive:2022.1` stands for the
[VFX Reference Platform](http://vfxplatform.com/) calendar year and `1` for the
Note that `2022` in `ci-olive:2022.2` stands for the
[VFX Reference Platform](http://vfxplatform.com/) calendar year and `2` for the
build image revision (should be incremented each time a new image is published).
Publish images:
@@ -65,5 +65,5 @@ docker push olivevideoeditor/ci-package-otio:0.14.1
docker push olivevideoeditor/ci-package-crashpad
docker push olivevideoeditor/ci-package-ffmpeg:5.0
docker push olivevideoeditor/ci-package-ocio:2022-2.1.1
docker push olivevideoeditor/ci-olive:2022.1
docker push olivevideoeditor/ci-olive:2022.2
```
docker/ci-olive/Dockerfile
+1 -1
View File
@@ -2,7 +2,7 @@
# SPDX-License-Identifier: GPL-3.0-or-later
# Build image (default):
# docker build -t olivevideoeditor/ci-olive:2022.1 -f ci-olive/Dockerfile .
# docker build -t olivevideoeditor/ci-olive:2022.2 -f ci-olive/Dockerfile .
#
# .n is the build image revision number. It should be incremented each time a
# new image is published (also update the GitHub Actions workflow!).
docker/ci-otio/Dockerfile
+3
View File
@@ -9,6 +9,7 @@ ARG ASWF_PKG_ORG=aswftesting
ARG CI_COMMON_VERSION=2
ARG VFXPLATFORM_VERSION=2022
ARG OTIO_VERSION=v0.14.1
ARG CXX_STANDARD=17
# We are currently not interested in the Python implementation and bindings
#FROM ${ASWF_PKG_ORG}/ci-package-python:${VFXPLATFORM_VERSION} as ci-package-python
@@ -20,6 +21,7 @@ FROM ${OLIVE_ORG}/ci-common:${CI_COMMON_VERSION} as ci-otio
ARG OLIVE_ORG
ARG VFXPLATFORM_VERSION
ARG OTIO_VERSION
ARG CXX_STANDARD
ARG PYTHON_VERSION=3.9
LABEL maintainer="olivevideoeditor@gmail.com"
@@ -36,6 +38,7 @@ ENV OLIVE_ORG=${OLIVE_ORG} \
CI_COMMON_VERSION=${CI_COMMON_VERSION} \
VFXPLATFORM_VERSION=${VFXPLATFORM_VERSION} \
OTIO_VERSION=${OTIO_VERSION} \
CXX_STANDARD=${CXX_STANDARD} \
OLIVE_INSTALL_PREFIX=/usr/local
# PYTHONPATH=/usr/local/lib/python${PYTHON_VERSION}/site-packages:/usr/local/lib/python \
docker/scripts/build_otio.sh
+1
View File
@@ -13,6 +13,7 @@ mkdir build
cd build
cmake .. -G "Ninja" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_CXX_STANDARD="${CXX_STANDARD}" \
-DCMAKE_INSTALL_PREFIX="${OLIVE_INSTALL_PREFIX}" \
-DOTIO_PYTHON_INSTALL=OFF
cmake --build .