Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 8 additions & 3 deletions .github/workflows/build-steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ on:
type: string
container:
type: string
container_volumes:
type: string
default: '[]'
cc_compiler:
type: string
cxx_compiler:
Expand Down Expand Up @@ -92,9 +95,11 @@ jobs:
runs-on: ${{ inputs.runner }}
container:
image: ${{ inputs.container }}
options: ${{ (contains(inputs.runner, 'gpu') && '-e NVIDIA_DRIVER_CAPABILITIES=compute,graphics,utility --gpus all') || '-e A=x' }}
# ^^ need extra options on the GPU runners to ensure OptiX is visible
# in the container.
volumes: ${{ fromJson( inputs.container_volumes ) }}
options: -v /:/host/root ${{ (contains(inputs.runner, 'gpu') && '-e NVIDIA_DRIVER_CAPABILITIES=compute,graphics,utility --gpus all') || '-e A=x' }}
# Extra options:
# - Ensure the GPU runners have OptiX is visible in the container.
# - Mount the native filesystem under /host/root
env:
CXX: ${{inputs.cxx_compiler}}
CC: ${{inputs.cc_compiler}}
Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ jobs:
volumes:
- /node20217:/node20217:rw,rshared
- /node20217:/__e/node20:ro,rshared
options: -v /:/host/root ${{ (contains(inputs.runner, 'gpu') && '-e NVIDIA_DRIVER_CAPABILITIES=compute,graphics,utility --gpus all') || '-e A=x' }}
env:
CXX: ${{matrix.cxx_compiler}}
CC: ${{matrix.cc_compiler}}
Expand Down Expand Up @@ -367,13 +368,10 @@ jobs:
OPENCOLORIO_CMAKE_FLAGS="-DCMAKE_CXX_COMPILER=g++"
- desc: icx/C++17 llvm14 py3.10 oiio-3.0 avx2
nametag: linux-icx
# This job variation needs a bigger runner with more "disk space",
# so only enable it when running on the main repo. Sorry, CI can't
# currently test with icx you people's individual forks until we
# figure out a way to require less space. Until then, they'll need
# to submit the PR to see how it does on icx.
runner: ${{ (github.repository_owner == 'AcademySoftwareFoundation' && 'ubuntu-22.04-8c-32g-300h') || 'ubuntu-latest' }}
disable: ${{ github.repository_owner != 'AcademySoftwareFoundation' }}
runner: ubuntu-latest
# If we ever need the big runner:
# runner: ${{ (github.repository_owner == 'AcademySoftwareFoundation' && 'ubuntu-22.04-8c-32g-300h') || 'ubuntu-latest' }}
# disable: ${{ github.repository_owner != 'AcademySoftwareFoundation' }}
container: aswftesting/ci-osl:2023-clang15
cc_compiler: icx
cxx_compiler: icpx
Expand Down
8 changes: 8 additions & 0 deletions src/build-scripts/gh-installdeps.bash
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@

set -ex

# Make extra space on the runners
df -h .
time rm -rf /usr/local/lib/android /host/root/usr/local/lib/android &
sleep 3


#
# Install system packages when those are acceptable for dependencies.
Expand Down Expand Up @@ -208,5 +213,8 @@ if [[ "$ABI_CHECK" != "" ]] ; then
source src/build-scripts/build_abi_tools.bash
fi

df -h .
df -h /host/root || true

# Save the env for use by other stages
src/build-scripts/save-env.bash
Loading