Skip to content

Commit 9117fd9

Browse files
committed
ci(docker): remove free-disk-space step; make ENGINE_ENABLE_NATIVE_CPU configurable
- Drop free-disk-space step (no longer needed with target: full) - Add ENGINE_ENABLE_NATIVE_CPU build-arg (default ON) for local builds - Set OFF in GitHub Actions for cross-arch portability - Re-enable CUDA 13 builds
1 parent 114e83a commit 9117fd9

3 files changed

Lines changed: 5 additions & 18 deletions

File tree

.devops/cpu.Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ ARG GCC_VERSION=14
1313
FROM docker.io/ubuntu:$UBUNTU_VERSION AS build
1414

1515
ARG GCC_VERSION=14
16+
ARG ENGINE_ENABLE_NATIVE_CPU=ON
1617

1718
# Install build toolchain
1819
RUN apt-get update && \
@@ -32,7 +33,7 @@ RUN cmake -S . -B build \
3233
-DENGINE_ENABLE_CUDA=OFF \
3334
-DENGINE_ENABLE_VULKAN=OFF \
3435
-DENGINE_ENABLE_OPENMP=ON \
35-
-DENGINE_ENABLE_NATIVE_CPU=OFF \
36+
-DENGINE_ENABLE_NATIVE_CPU=$ENGINE_ENABLE_NATIVE_CPU \
3637
-DENGINE_BUILD_EXAMPLES=OFF \
3738
-DENGINE_BUILD_TESTS=OFF \
3839
-DENGINE_BUILD_WARMBENCH=OFF && \

.devops/cuda.Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ ARG BASE_CUDA_RUN_CONTAINER=docker.io/nvidia/cuda:${CUDA_VERSION}-runtime-ubuntu
1717
FROM ${BASE_CUDA_DEV_CONTAINER} AS build
1818

1919
ARG GCC_VERSION=14
20+
ARG ENGINE_ENABLE_NATIVE_CPU=ON
2021

2122
# Install build toolchain
2223
RUN apt-get update && \
@@ -37,7 +38,7 @@ RUN cmake -S . -B build \
3738
-DENGINE_ENABLE_CUDA_GRAPHS=ON \
3839
-DENGINE_ENABLE_VULKAN=OFF \
3940
-DENGINE_ENABLE_OPENMP=ON \
40-
-DENGINE_ENABLE_NATIVE_CPU=OFF \
41+
-DENGINE_ENABLE_NATIVE_CPU=$ENGINE_ENABLE_NATIVE_CPU \
4142
-DENGINE_BUILD_EXAMPLES=OFF \
4243
-DENGINE_BUILD_TESTS=OFF \
4344
-DENGINE_BUILD_WARMBENCH=OFF && \

.github/workflows/docker.yml

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -118,15 +118,13 @@ jobs:
118118
platforms: linux/amd64
119119
arch: amd64
120120
runs_on: ubuntu-24.04
121-
free_disk: true
122121
cuda_version: "12.9.2"
123122
enabled: true
124123
- tag: cuda12
125124
dockerfile: .devops/cuda.Dockerfile
126125
platforms: linux/arm64
127126
arch: arm64
128127
runs_on: ubuntu-24.04-arm
129-
free_disk: true
130128
cuda_version: "12.9.2"
131129
enabled: true
132130
# ── CUDA 13 ──
@@ -135,15 +133,13 @@ jobs:
135133
platforms: linux/amd64
136134
arch: amd64
137135
runs_on: ubuntu-24.04
138-
free_disk: true
139136
cuda_version: "13.3.0"
140137
enabled: true
141138
- tag: cuda13
142139
dockerfile: .devops/cuda.Dockerfile
143140
platforms: linux/arm64
144141
arch: arm64
145142
runs_on: ubuntu-24.04-arm
146-
free_disk: true
147143
cuda_version: "13.3.0"
148144
enabled: true
149145
steps:
@@ -167,18 +163,6 @@ jobs:
167163
username: ${{ github.repository_owner }}
168164
password: ${{ secrets.GITHUB_TOKEN }}
169165

170-
- name: Free disk space
171-
if: ${{ matrix.enabled == true && matrix.free_disk }}
172-
uses: ggml-org/free-disk-space@v1.3.1
173-
with:
174-
tool-cache: false
175-
android: true
176-
dotnet: true
177-
haskell: true
178-
large-packages: true
179-
docker-images: true
180-
swap-storage: true
181-
182166
- name: Build and push
183167
id: push
184168
if: ${{ matrix.enabled == true }}
@@ -196,6 +180,7 @@ jobs:
196180
APP_REVISION=${{ github.sha }}
197181
IMAGE_URL=${{ github.server_url }}/${{ github.repository }}
198182
IMAGE_SOURCE=${{ github.server_url }}/${{ github.repository }}
183+
ENGINE_ENABLE_NATIVE_CPU=OFF # disable for cross-arch portability
199184
${{ matrix.cuda_version && format('CUDA_VERSION={0}', matrix.cuda_version) || '' }}
200185
cache-from: type=registry,ref=ghcr.io/${{ env.IMAGE_REPO }}:cache-${{ matrix.arch }}-${{ matrix.tag }}
201186
cache-to: type=registry,ref=ghcr.io/${{ env.IMAGE_REPO }}:cache-${{ matrix.arch }}-${{ matrix.tag }},mode=max

0 commit comments

Comments
 (0)