Skip to content

ci: fix Vulkan Docker build failures and GHCR registry timeout #136

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.

Sign up for GitHub

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

Open
Ektisad25 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

ci: fix Vulkan Docker build failures and GHCR registry timeout #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
036a2d1
chore: update CMakePresets for low-memory build preset
Ektisad25 May 18, 2026
8f62a92
ci: stabilize Vulkan Docker image build on GitHub Actions
Ektisad25 May 18, 2026
789d827
ci: add glslc package fallbacks for Vulkan Docker build
Ektisad25 May 18, 2026
37a8fec
ci: reduce parallel docker pushes to mitigate GHCR timeouts
Ektisad25 May 18, 2026
440a8a4
Merge branch 'master' into fix/docker-ci-vulkan-and-presets
Ektisad25 May 18, 2026
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
15 changes: 11 additions & 4 deletions .devops/vulkan.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
ARG UBUNTU_VERSION=26.04
ARG UBUNTU_VERSION=24.04

FROM ubuntu:$UBUNTU_VERSION AS build

# Install build tools
RUN apt update && apt install -y git build-essential cmake wget xz-utils

# Install SSL and Vulkan SDK dependencies
RUN apt install -y libssl-dev curl \
libxcb-xinput0 libxcb-xinerama0 libxcb-cursor-dev libvulkan-dev glslc
# Install cURL and Vulkan SDK dependencies.
RUN apt install -y libcurl4-openssl-dev curl \
libxcb-xinput0 libxcb-xinerama0 libxcb-cursor-dev libvulkan-dev

# glslc package naming differs across Ubuntu releases/runners.
RUN apt install -y glslc \
|| apt install -y shaderc \
|| apt install -y shaderc-tools

RUN command -v glslc

# Build it
WORKDIR /app
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ jobs:
COMMIT_SHA: ${{ github.sha }}
strategy:
fail-fast: false
max-parallel: 2
matrix:
config:
# Multi-stage build
Expand Down
25 changes: 21 additions & 4 deletions CMakePresets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": 4,
"version": 3,
"configurePresets": [
{
"name": "base",
Expand Down Expand Up @@ -64,6 +64,15 @@
},
{ "name": "x64-linux-gcc-debug", "inherits": [ "base", "x64-linux-gcc", "debug" ] },
{ "name": "x64-linux-gcc-release", "inherits": [ "base", "x64-linux-gcc", "release" ] },
{
"name": "x64-linux-gcc-lowmem-release",
"inherits": [ "base", "x64-linux-gcc", "release" ],
"cacheVariables": {
"LLAMA_BUILD_SERVER": "OFF",
"LLAMA_BUILD_TESTS": "OFF",
"LLAMA_BUILD_EXAMPLES": "OFF"
}
},
{ "name": "x64-linux-gcc-reldbg", "inherits": [ "base", "x64-linux-gcc", "reldbg" ] },
{ "name": "x64-linux-gcc+static-release", "inherits": [ "base", "x64-linux-gcc", "release", "static" ] },

Expand All @@ -89,7 +98,15 @@
{ "name": "x64-windows-sycl-release", "inherits": [ "sycl-base", "release" ] },
{ "name": "x64-windows-sycl-release-f16", "inherits": [ "sycl-base", "release", "sycl_f16" ] },

{ "name": "x64-windows-vulkan-debug", "inherits": [ "base", "vulkan", "debug" ] },
{ "name": "x64-windows-vulkan-release", "inherits": [ "base", "vulkan", "release" ] }
]
{ "name": "x64-windows-vulkan-debug", "inherits": [ "base", "vulkan", "debug" ] },
{ "name": "x64-windows-vulkan-release", "inherits": [ "base", "vulkan", "release" ] }
],
"buildPresets": [
{
"name": "x64-linux-gcc-lowmem-release-cli",
"configurePreset": "x64-linux-gcc-lowmem-release",
"targets": [ "llama-cli" ],
"jobs": 1
}
]
}