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.

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

Very initial support for CY2023 / Rocky 8 containers #166

Merged
merged 37 commits into from
Jun 8, 2023
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
3c50a8a
Very initial support for CY2023 / Rocky 8 containers
jfpanisset Feb 5, 2023
2cf600d
- python/aswfdocker/data/versions.yaml
jfpanisset Feb 6, 2023
6071b53
More build fixes
jfpanisset Feb 6, 2023
e105e44
More build fixes
jfpanisset Feb 6, 2023
f318be7
More build fixes
jfpanisset Feb 6, 2023
d036d6a
Bump up CMake to latest 3.25.2
jfpanisset Feb 7, 2023
ab5c8d0
Dockerfile typo fix
jfpanisset Feb 7, 2023
335c9f7
Conan related fixes
jfpanisset Feb 7, 2023
3f91426
devtoolset now called gcc-toolset
jfpanisset Feb 8, 2023
4825eb6
Dockerfile and qt fixes
jfpanisset Feb 9, 2023
f5c2356
common and base now build
jfpanisset Feb 12, 2023
8160f2d
Most conan related fixes
jfpanisset Mar 14, 2023
a487b69
pipenv fixes
jfpanisset Mar 14, 2023
4150808
Roll back pipenv
jfpanisset Mar 14, 2023
9b4e098
OpenEXR and MaterialX version bump, conan install script
jfpanisset Apr 23, 2023
1ea443b
CI build fix
jfpanisset Apr 23, 2023
c448963
No more centos devel packages
jfpanisset Apr 24, 2023
889821f
Qt 5.15.9
jfpanisset Apr 24, 2023
0d009ef
PySide2 5.15.9 and Conan local cache
jfpanisset Apr 24, 2023
6edf9b2
Bump up USD to 23.05
jfpanisset Apr 24, 2023
3916808
Conan install script fix and build doc updates
jfpanisset Apr 25, 2023
5b7da0e
Read-Write conan_home, conan wrapper debugging
jfpanisset Apr 25, 2023
add3002
Explicit python versions for pybind11 and boost conan packages
jfpanisset Apr 26, 2023
2ec16de
Add OpenGL Layer on top of cuda container
jfpanisset May 14, 2023
b808392
Fix Python test case
jfpanisset May 14, 2023
3eb3f25
ASWF_BASEOS_DISTRO needed to test for opengl install
jfpanisset May 14, 2023
e42c5c6
Lock pylint to 2.17, 3.0 is alpha and has breaking changes
jfpanisset May 14, 2023
1aa06df
Fix conan packaging vis pyinstaller
jfpanisset May 15, 2023
25091ba
Conan recipe fixes for Qt 5.15.9
jfpanisset May 16, 2023
706a65d
Multi-year Conan fixes, imath 3.1.8
jfpanisset May 31, 2023
7e9f81f
Python patch library used by Conan ignores renames
jfpanisset May 31, 2023
f0de3cb
imath 3.1.9 and Qt Conan build
jfpanisset Jun 5, 2023
397e3f4
Conan recipe fix for PySide
jfpanisset Jun 5, 2023
1e2f6c3
Larger runners for releases
jfpanisset Jun 5, 2023
d5fd9d5
OpenEXR 3.1.8
jfpanisset Jun 6, 2023
91e60bc
Update ChangeLog
jfpanisset Jun 7, 2023
b636515
Changelog typo
jfpanisset Jun 7, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/docker-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
- name: Activate Docker buildx
run: |
mkdir -p ~/.docker/cli-plugins
curl --location https://github.com/docker/buildx/releases/download/v0.3.1/buildx-v0.3.1.linux-amd64 -o ~/.docker/cli-plugins/docker-buildx
curl --location https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-amd64 -o ~/.docker/cli-plugins/docker-buildx
chmod a+x ~/.docker/cli-plugins/docker-buildx

- name: Set up Python
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
if: ${{ matrix.build }}
run: |
mkdir -p ~/.docker/cli-plugins
curl --location https://github.com/docker/buildx/releases/download/v0.3.1/buildx-v0.3.1.linux-amd64 -o ~/.docker/cli-plugins/docker-buildx
curl --location https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-amd64 -o ~/.docker/cli-plugins/docker-buildx
chmod a+x ~/.docker/cli-plugins/docker-buildx
docker buildx create --name forpushing --use
docker buildx inspect --bootstrap
Expand Down
52 changes: 52 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,58 @@

All notable changes to this project will be documented in this file.

## 2023-03-07

* New ci-common-v3 for VFX Platform 2023 based on:
* C++17 (unchanged)
* Ccache 4.7.4 (from 4.0)
* Clang 14.0.6 (from 14.0.0)
jfpanisset marked this conversation as resolved.
Show resolved Hide resolved
* Conan 1.58.0 (from 1.47.0)
* CUDA 11.8 (from 11.4.0)
* gcc-toolset 11 / gcc 11.2.1 (from DTS 9 / gcc 9.3.1)
* glibc 2.28 (from 2.17)
* libstdc++11 new ABI
* Ninja 1.11.1 (from 1.11.0)
* Rocky Linux 8.7 (from CentOS 7.9)
* SonarScan 4.8.0.2856 (from 4.7.0.2747)
* Updated 2023 Packages
* Alembic 1.8.4 (from 1.8.2)
* Boost 1.80.0 (from 1.76.0)
* CMake 3.25.2 (from 3.22.0)
* MaterialX 1.38.6 (from 1.38.5)
* NumPy 1.23.5 (from 1.20)
* OpenColorIO 2.2.1 (from 2.1.1)
* OpenImageIO 2.4.8.0 (from 2.4.5.0)
jfpanisset marked this conversation as resolved.
Show resolved Hide resolved
* OpenSubdiv 3.5.0 (from 3.4.4)
* OpenVDB 10.0.1 (from 9.1.0)
* OpenShadingLanguage 1.12.9.0 (from 1.12.7.0)
jfpanisset marked this conversation as resolved.
Show resolved Hide resolved
* OpenTimelineIO 0.15 (from 0.14.1)
* Partio 1.14.6 (from 1.14.0)
* Ptex 2.4.2 (from 2.4.0)
* PySide 5.15.8 (from 5.15.2)
* Python 3.10.9 (from 3.9.15)
* Qt 5.15.8 (from 5.15.2)
* USD 23.02 (from 22.11)
* Unchanged 2023 Packages
* Imath 3.1.5
jfpanisset marked this conversation as resolved.
Show resolved Hide resolved
* OpenEXR 3.1.5
* TBB 2020u3

### New CI Images

* `aswf/ci-common:3.0`: A base Rocky 8 image with GCC 11.2.1 (DTS 11), Clang 14.1 and CUDA 11.8.
* `aswf/ci-base:2023.0`
* `aswf/ci-baseqt:2023.0`
* `aswf/ci-opencue:2023.0`
* `aswf/ci-openexr:2023.0`
* `aswf/ci-ocio:2023.0`
* `aswf/ci-otio:2023.0`
* `aswf/ci-materialx:2023.0`
* `aswf/ci-usd:2023.0`
* `aswf/ci-osl:2023-clang14.0`
* `aswf/ci-openvdb:2023-clang14.0`
* `aswf/ci-vfxall:2023-clang14.0'

## 2023-01-21

* Added missing MaterialX to `ci-vfxall`
Expand Down
19 changes: 14 additions & 5 deletions README.md

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions ci-base/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions ci-base/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions ci-baseqt/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions ci-baseqt/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 14 additions & 3 deletions ci-common/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions ci-common/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions ci-common/image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ implicit_packages:
- dts
- sonar
- conan
docker_from: nvidia/cudagl:${ASWF_CUDA_VERSION}-devel-centos7
docker_from: ${ASWF_BASEOS_IMAGE}:${ASWF_CUDA_VERSION}-devel-${ASWF_BASEOS_DISTRO}
docker_package_version: $CI_COMMON_VERSION
docker_commands: |
USER root
Expand All @@ -24,8 +24,8 @@ docker_commands: |
RUN mkdir /opt/aswf
WORKDIR /opt/aswf

ENV LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib64:/opt/rh/httpd24/root/usr/lib64:/opt/rh/devtoolset-${ASWF_DTS_VERSION}/root/usr/lib64:/opt/rh/devtoolset-${ASWF_DTS_VERSION}/root/usr/lib:${LD_LIBRARY_PATH} \
PATH=/opt/rh/rh-git218/root/usr/bin:/usr/local/bin:/opt/rh/devtoolset-${ASWF_DTS_VERSION}/root/usr/bin:/opt/app-root/src/bin:/opt/rh/devtoolset-${ASWF_DTS_VERSION}/root/usr/bin/:/usr/local/sbin:/usr/sbin:/usr/bin:/sbin:/bin \
ENV LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib64:/opt/rh/httpd24/root/usr/lib64:/opt/rh/${ASWF_DTS_PREFIX}-${ASWF_DTS_VERSION}/root/usr/lib64:/opt/rh/${ASWF_DTS_PREFIX}-${ASWF_DTS_VERSION}/root/usr/lib:${LD_LIBRARY_PATH} \
PATH=/opt/rh/rh-git218/root/usr/bin:/usr/local/bin:/opt/rh/${ASWF_DTS_PREFIX}-${ASWF_DTS_VERSION}/root/usr/bin:/opt/app-root/src/bin:/opt/rh/${ASWF_DTS_PREFIX}-${ASWF_DTS_VERSION}/root/usr/bin/:/usr/local/sbin:/usr/sbin:/usr/bin:/sbin:/bin \
PERL5LIB=/opt/rh/rh-git218/root/usr/share/perl5/vendor_perl \
MANPATH=/opt/rh/rh-git218/root/usr/share/man

Expand Down
4 changes: 4 additions & 0 deletions ci-materialx/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions ci-materialx/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions ci-ocio/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions ci-ocio/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions ci-opencue/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions ci-opencue/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions ci-openexr/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions ci-openexr/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions ci-openvdb/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading