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
4 changes: 4 additions & 0 deletions .github/workflows/build-steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,10 @@ jobs:
container:
image: ${{ inputs.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:

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not used this conditional syntax before, I'm guessing that the || '-e A=x' part just sets an innocuous env var A=x since you can't have an empty "else" part of the conditional?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so. That part is just ported from OSL and is what I needed to make it work.

# - 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: 10 additions & 2 deletions src/build-scripts/gh-installdeps.bash
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,14 @@


set -ex
df -h

# Make extra space on the runners
df -h .
time rm -rf /usr/local/lib/android /host/root/usr/local/lib/android &
sleep 3
# rather than block, delete in background, but give it a few secs to start
# clearing things out before moving on.
# Other candidates, if we need it: /usr/share/dotnet /usr/local/.ghcup


#
Expand Down Expand Up @@ -219,7 +226,8 @@ if [[ "$USE_ICC" != "" ]] ; then
export CC=icc
fi

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

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