VFX Platform 2025 initial images

.github/workflows/docker-builds.yml

@@ -14,7 +14,7 @@ on:
 
 jobs:
   build:
-    runs-on: ${{ (github.repository_owner == 'AcademySoftwareFoundation' && 'ubuntu-20.04-8c-32g-300h') || 'ubuntu-latest' }}
+    runs-on: ${{ (github.repository_owner == 'AcademySoftwareFoundation' && 'ubuntu-22.04-8c-32g-300h') || 'ubuntu-latest' }}
     env:
       DOCKER_CLI_EXPERIMENTAL: enabled
       DOCKER_BUILDKIT: '1'
@@ -24,22 +24,24 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - group: vfx-2024
-            name: vfx-2024
-            common_version: 4-clang16
-            common_version_noclang: 4
-            version: 2024-clang16
-            version_noclang: 2024
+          - group: vfx-2025
+            name: vfx-2025
+            common_version: 5-clang18
+            common_version_noclang: 5
+            version: 2025-clang18
+            version_noclang: 2025
             test: ""
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
     - name: Activate Docker buildx
-      uses: docker/setup-buildx-action@v3
+      uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
+      with: 
+        driver-opts: env.BUILDKIT_STEP_LOG_MAX_SIZE=10485760
 
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
       with:
         python-version: 3.9
         cache: 'pipenv'
@@ -50,19 +52,29 @@ jobs:
 
     - name: Free up disk space
       run: |
-        sudo apt-get remove -y '^llvm-.*'
-        sudo apt-get remove -y 'php.*'
-        sudo apt-get remove -y '^cpp.*'
-        sudo apt-get remove -y '^g\+\+.*'
-        sudo apt-get remove -y '^clang.*'
-        sudo apt-get remove -y '^gfortran.*'
-        sudo apt-get remove -y google-chrome-stable firefox powershell mono-devel monodoc-http
+        df -h
+        sudo apt-get remove -y '^llvm-.*' 'php.*' '^cpp.*' '^g\+\+.*' '^clang.*' '^gfortran.*' \
+            '^dotnet-.*' '^libmono-.*' '^mono-.*' monodoc-http '^r-.*' '^ruby.*' \
+            ant ant-optional aria2 azure-cli firefox google-chrome-stable microsoft-edge-stable powershell \
+            imagemagick '^imagemagick-.*' '^libmagickcore-.*' '^libmagickwand-.*'  kubectl mercurial mercurial-common subversion
         sudo apt-get autoremove -y
         sudo apt-get clean
-        rm -rf /usr/share/dotnet/
+        sudo rm -rf \
+            /usr/share/dotnet/ \
+            /usr/local/lib/android \
+            /opt/ghc \
+            /usr/local/share/powershell \
+            /usr/share/swift \
+            /usr/local/.ghcup \
+            /usr/local/aws-cli \
+            /usr/local/aws-sam-cli \
+            /usr/local/julia* \
+            /usr/lib/jvm || true
+        sudo docker system prune -a
         df -h
+        dpkg -l 
 
-    - name: Build Ninja (Conan)
+    - name: Build Ninja and CMake (Conan)
       run: |
         set -ex
         pipenv run aswfdocker \
@@ -76,7 +88,8 @@ jobs:
           --version ${{ matrix.common_version }} \
           --use-conan \
           --build-missing \
-          --target ninja
+          --target ninja \
+          --target cmake
 
     - name: Build Clang (Conan)
       run: |
@@ -94,7 +107,7 @@ jobs:
           --build-missing \
           --target clang
 
-    - name: build ci-common Docker Image for downstream images
+    - name: Build ci-common Docker Image for downstream images
       run: |
         pipenv run aswfdocker \
           --repo-uri $GITHUB_REPOSITORY \
@@ -106,7 +119,50 @@ jobs:
           --version ${{ matrix.common_version }}\
           --push NO
 
-    - name: Build base1 Conan packages for base image
+    - name: Build base1 system wrapper and level 1 Conan packages
+      run: |
+        set -ex
+        pipenv run aswfdocker \
+          --repo-uri $GITHUB_REPOSITORY \
+          --source-branch $GITHUB_REF \
+          --verbose \
+          build \
+          --ci-image-type PACKAGE \
+          --group base1-wrappers \
+          --group base1-1 \
+          --version ${{ matrix.version_noclang }} \
+          --use-conan \
+          --build-missing
+
+    - name: Build base1 level 2 Conan packages
+      run: |
+        set -ex
+        pipenv run aswfdocker \
+          --repo-uri $GITHUB_REPOSITORY \
+          --source-branch $GITHUB_REF \
+          --verbose \
+          build \
+          --ci-image-type PACKAGE \
+          --group base1-2 \
+          --version ${{ matrix.version_noclang }} \
+          --use-conan \
+          --build-missing
+
+    - name: Build base1 level 3 Conan packages
+      run: |
+        set -ex
+        pipenv run aswfdocker \
+          --repo-uri $GITHUB_REPOSITORY \
+          --source-branch $GITHUB_REF \
+          --verbose \
+          build \
+          --ci-image-type PACKAGE \
+          --group base1-3 \
+          --version ${{ matrix.version_noclang }} \
+          --use-conan \
+          --build-missing
+
+    - name: Build base2 system wrapper and dependency Conan packages for ci-baseqt image
       run: |
         set -ex
         pipenv run aswfdocker \
@@ -115,12 +171,13 @@ jobs:
           --verbose \
           build \
           --ci-image-type PACKAGE \
-          --group base1 \
+          --group base2-wrappers \
+          --group base2-1
           --version ${{ matrix.version_noclang }} \
           --use-conan \
           --build-missing
 
-    - name: Build base2 Conan packages (Qt) for base image
+    - name: Build base2 level 2 Conan packages (Qt) for ci-baseqt image
       run: |
         set -ex
         pipenv run aswfdocker \
@@ -129,7 +186,7 @@ jobs:
           --verbose \
           build \
           --ci-image-type PACKAGE \
-          --group base2 \
+          --group base2-2 \
           --version ${{ matrix.version_noclang }} \
           --use-conan \
           --build-missing
@@ -148,7 +205,7 @@ jobs:
           --use-conan \
           --build-missing
 
-    - name: Build base image
+    - name: Build base and baseqt images
       run: |
         set -ex
         pipenv run aswfdocker \
@@ -161,57 +218,112 @@ jobs:
           --version ${{ matrix.version }} \
           --push NO
 
-    - run: |
+    - name: Build vfx1 system wrapper and level 1 Conan packages
+      run: |
         set -ex
         pipenv run aswfdocker \
           --repo-uri $GITHUB_REPOSITORY \
           --source-branch $GITHUB_REF \
           --verbose \
           build \
           --ci-image-type PACKAGE \
-          --group vfx1 \
-          --target imath \
+          --group vfx1-wrappers \ 
+          --group vfx1-1 \
           --version ${{ matrix.version_noclang }} \
           --use-conan \
           --build-missing \
           --push NO
+
+    - name: Build vfx1 level 2 Conan packages
+      run: |
+        set -ex
         pipenv run aswfdocker \
           --repo-uri $GITHUB_REPOSITORY \
           --source-branch $GITHUB_REF \
           --verbose \
           build \
           --ci-image-type PACKAGE \
-          --group vfx1 \
-          --target openexr \
+          --group vfx1-2 \
           --version ${{ matrix.version_noclang }} \
           --use-conan \
           --build-missing \
           --push NO
+
+    - name: Build vfx1 level 3 Conan packages
+      run: |
+        set -ex
         pipenv run aswfdocker \
           --repo-uri $GITHUB_REPOSITORY \
           --source-branch $GITHUB_REF \
           --verbose \
           build \
           --ci-image-type PACKAGE \
-          --group vfx1 \
-          --group vfx2 \
+          --group vfx1-3 \
+          --version ${{ matrix.version_noclang }} \
+          --use-conan \
+          --build-missing \
+          --push NO
+
+    - name: Build vfx1 level 4 Conan packages
+      run: |
+        set -ex
+        pipenv run aswfdocker \
+          --repo-uri $GITHUB_REPOSITORY \
+          --source-branch $GITHUB_REF \
+          --verbose \
+          build \
+          --ci-image-type PACKAGE \
+          --group vfx1-4 \
           --version ${{ matrix.version_noclang }} \
           --use-conan \
           --build-missing \
           --push NO
+
+    - name: Build vfx1 level 5 non-Conan packages
+      run: |
+        set -ex
         pipenv run aswfdocker \
           --repo-uri $GITHUB_REPOSITORY \
           --source-branch $GITHUB_REF \
           --verbose \
           build \
           --ci-image-type PACKAGE \
           --group vfx1 \
+          --version ${{ matrix.version_noclang }} \
+          --build-missing \
+          --push NO
+
+    - name: Build vfx2 level 1 Conan packages
+      run: |
+        set -ex
+        pipenv run aswfdocker \
+          --repo-uri $GITHUB_REPOSITORY \
+          --source-branch $GITHUB_REF \
+          --verbose \
+          build \
+          --ci-image-type PACKAGE \
+          --group vfx2-1 \
+          --version ${{ matrix.version_noclang }} \
+          --use-conan \
+          --build-missing \
+          --push NO
+
+    - name: Build vfx2 level 2 non-Conan packages
+      run: |
+        set -ex
+        pipenv run aswfdocker \
+          --repo-uri $GITHUB_REPOSITORY \
+          --source-branch $GITHUB_REF \
+          --verbose \
+          build \
+          --ci-image-type PACKAGE \
           --group vfx2 \
           --version ${{ matrix.version_noclang }} \
+          --build-missing \
           --push NO
-      name: Build vfx1/vfx2 packages
 
-    - run: |
+    - name: Build vfx1 / vfx2 images   
+      run: |
         set -ex
         pipenv run aswfdocker \
           --repo-uri $GITHUB_REPOSITORY \
@@ -223,9 +335,9 @@ jobs:
           --group vfx2 \
           --version ${{ matrix.version_noclang }} \
           --push NO
-      name: Build vfx1/vfx2 images
 
-    - run: |
+    - name: Build vfx images
+      run: |
         set -ex
         pipenv run aswfdocker \
           --repo-uri $GITHUB_REPOSITORY \
@@ -236,7 +348,6 @@ jobs:
           --group vfx3 \
           --version ${{ matrix.version }} \
           --push NO
-      name: Build vfx3 image
 
     - run: |
         set -ex

.github/workflows/python-sonar.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.9
         cache: 'pipenv'

.github/workflows/python.yml

@@ -20,7 +20,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.9
         cache: 'pipenv'

.github/workflows/release.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   release:
-    runs-on: ubuntu-20.04-8c-32g-300h
+    runs-on: ${{ (github.repository_owner == 'AcademySoftwareFoundation' && 'ubuntu-22.04-8c-32g-300h') || 'ubuntu-latest' }}
     env:
       DOCKER_CLI_EXPERIMENTAL: enabled
       DOCKER_BUILDKIT: '1'
@@ -31,9 +31,11 @@ jobs:
 
     - name: Activate Docker buildx
       uses: docker/setup-buildx-action@v3
+      with:
+        driver-opts: env.BUILDKIT_STEP_LOG_MAX_SIZE=10485760
 
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.9
         cache: 'pipenv'

.pre-commit-config.yaml

@@ -2,8 +2,10 @@ repos:
 -   repo: https://github.com/ambv/black
     rev: 22.12.0
     hooks:
+    # Don't reformat vendored Conan recipes
     - id: black
       language_version: python3.9
+      exclude: packages/conan/recipes/
 -   repo: local
     hooks:
       - id: pytest