From 0708e8c95ddab6596ed809c17b2e6b18e47a0fc7 Mon Sep 17 00:00:00 2001
From: Russell McGuire <russell.w.mcguire@intel.com>
Date: Tue, 13 Oct 2026 08:24:14 -0700
Subject: [PATCH 1/2] CI: remove unused ghcr-based Dockerfiles

rhel/sles/ubuntu.Dockerfile build FROM the retired private
ghcr.io/oneapi-src/level-zero-linux-compute images; CI uses .github/docker/ci.

Signed-off-by: Russell McGuire <russell.w.mcguire@intel.com>
---
 .github/docker/rhel.Dockerfile   |  8 -----
 .github/docker/sles.Dockerfile   |  8 -----
 .github/docker/ubuntu.Dockerfile | 58 --------------------------------
 3 files changed, 74 deletions(-)
 delete mode 100644 .github/docker/rhel.Dockerfile
 delete mode 100644 .github/docker/sles.Dockerfile
 delete mode 100644 .github/docker/ubuntu.Dockerfile

diff --git a/.github/docker/rhel.Dockerfile b/.github/docker/rhel.Dockerfile
deleted file mode 100644
index d8869fa2..00000000
--- a/.github/docker/rhel.Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-# syntax=docker/dockerfile:1.4
-
-ARG VMAJ
-ARG VMIN
-
-FROM ghcr.io/oneapi-src/level-zero-linux-compute/rhel:${VMAJ}.${VMIN}
-
-SHELL ["/bin/bash", "-e", "-c"]
\ No newline at end of file
diff --git a/.github/docker/sles.Dockerfile b/.github/docker/sles.Dockerfile
deleted file mode 100644
index 7991c4cc..00000000
--- a/.github/docker/sles.Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-# syntax=docker/dockerfile:1.4
-
-ARG VMAJ
-ARG VMIN
-
-FROM ghcr.io/oneapi-src/level-zero-linux-compute/sles:${VMAJ}.${VMIN}
-
-SHELL ["/bin/bash", "-e", "-c"]
\ No newline at end of file
diff --git a/.github/docker/ubuntu.Dockerfile b/.github/docker/ubuntu.Dockerfile
deleted file mode 100644
index 304fd8f1..00000000
--- a/.github/docker/ubuntu.Dockerfile
+++ /dev/null
@@ -1,58 +0,0 @@
-# syntax=docker/dockerfile:1.4
-
-ARG VMAJ
-ARG VMIN
-FROM ghcr.io/oneapi-src/level-zero-linux-compute/ubuntu:${VMAJ}.${VMIN}
-
-ARG VMAJ
-ARG VMIN
-
-SHELL ["/bin/bash", "-e", "-c"]
-
-RUN <<EOF
-source /etc/lsb-release
-if ((VMAJ < 24)); then
-    sed -i 's/^deb/deb [arch=amd64]/' /etc/apt/sources.list
-    cat >> /etc/apt/sources.list <<EOF2
-deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ ${DISTRIB_CODENAME} main restricted universe multiverse
-deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ ${DISTRIB_CODENAME}-updates main restricted universe multiverse
-deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ ${DISTRIB_CODENAME}-security main restricted universe multiverse
-deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ ${DISTRIB_CODENAME}-backports main restricted universe multiverse
-EOF2
-else
-    sed -i '/^Components:/a Architectures: amd64' /etc/apt/sources.list.d/ubuntu.sources
-    cat >> /etc/apt/sources.list.d/ubuntu.sources <<EOF2
-
-types: deb
-URIs: http://ports.ubuntu.com/ubuntu-ports/
-Suites: ${DISTRIB_CODENAME} ${DISTRIB_CODENAME}-updates ${DISTRIB_CODENAME}-security ${DISTRIB_CODENAME}-backports
-Components: main universe restricted multiverse
-Architectures: arm64
-Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
-EOF2
-fi
-dpkg --add-architecture arm64
-EOF
-
-ENV DEBIAN_FRONTEND=noninteractive
-# /etc/apt/apt.conf.d/docker-clean doesn't work on older versions of docker for U2204 containers
-RUN --mount=type=cache,target=/var/cache/apt <<EOF
-rm /etc/apt/apt.conf.d/docker-clean
-apt-get update
-apt-get install -y \
-  build-essential \
-  ccache \
-  cmake \
-  universal-ctags \
-  curl \
-  elfutils \
-  file \
-  gcc-aarch64-linux-gnu \
-  g++-aarch64-linux-gnu \
-  libc6:arm64 \
-  libstdc++6:arm64 \
-  git \
-  ninja-build \
-  python3
-rm -rf /var/lib/apt/lists/*
-EOF
\ No newline at end of file

From 172bd417ccbe5d7e91a6b18182ee71520578dc66 Mon Sep 17 00:00:00 2001
From: Russell McGuire <russell.w.mcguire@intel.com>
Date: Tue, 13 Oct 2026 09:01:32 -0700
Subject: [PATCH 2/2] CI: remove unused windows.Dockerfile

Only infra images.yml built it, and that workflow is retired; Windows CI
runs on windows-latest with the msvc-env action.

Signed-off-by: Russell McGuire <russell.w.mcguire@intel.com>
---
 .github/docker/windows.Dockerfile | 45 -------------------------------
 1 file changed, 45 deletions(-)
 delete mode 100644 .github/docker/windows.Dockerfile

diff --git a/.github/docker/windows.Dockerfile b/.github/docker/windows.Dockerfile
deleted file mode 100644
index 880c9d65..00000000
--- a/.github/docker/windows.Dockerfile
+++ /dev/null
@@ -1,45 +0,0 @@
-# escape=`
-
-ARG BASE_IMAGE=mcr.microsoft.com/dotnet/framework/runtime:4.8
-FROM ${BASE_IMAGE}
-
-SHELL ["powershell"]
-ENV VS_VERSION=2022
-RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; `
-    Switch ($env:VS_VERSION) { `
-        "2019" {$url_version = "16"} `
-        "2022" {$url_version = "17"} `
-        default {echo "Unsupported VS version $env:VS_VERSION"; EXIT 1} `
-    }; `
-    wget -Uri https://aka.ms/vs/${url_version}/release/vs_buildtools.exe -OutFile vs_buildtools.exe
-SHELL ["cmd", "/S", "/C"]
-RUN (start /w vs_buildtools.exe --quiet --wait --norestart --nocache `
-        --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\%VS_VERSION%\BuildTools" `
-        --add Microsoft.Component.MSBuild `
-        --add Microsoft.VisualStudio.Component.VC.CoreBuildTools `
-        --add Microsoft.VisualStudio.Component.VC.Redist.14.Latest `
-        --add Microsoft.VisualStudio.Component.Windows10SDK `
-        --add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core `
-        --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 `
-        --add Microsoft.VisualStudio.Component.Windows10SDK.19041 `
-        --add Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre `
-        || IF "%ERRORLEVEL%"=="3010" EXIT 0) `
-    && del /q vs_buildtools.exe `
-    && mklink /d "C:\Program Files (x86)\Microsoft Visual Studio\current" "C:\Program Files (x86)\Microsoft Visual Studio\%VS_VERSION%" `
-    && if not exist "C:\Program Files (x86)\Microsoft Visual Studio\%VS_VERSION%\BuildTools\Common7\Tools\VsDevCmd.bat" exit 1
-ENTRYPOINT ["C:\\Program Files (x86)\\Microsoft Visual Studio\\current\\BuildTools\\VC\\Auxiliary\\Build\\vcvars64.bat", "&&"]
-
-SHELL ["powershell"]
-ENV chocolateyUseWindowsCompression false
-RUN Set-ExecutionPolicy Bypass -Scope Process -Force; `
-    [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; `
-    iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
-SHELL ["cmd", "/S", "/C"]
-RUN call "%ProgramFiles(x86)%\Microsoft Visual Studio\current\BuildTools\VC\Auxiliary\Build\vcvars64.bat" && `
-    powershell -command "[Environment]::SetEnvironmentVariable('Path', $env:Path, [System.EnvironmentVariableTarget]::Machine)"
-RUN choco feature disable --name showDownloadProgress && `
-    choco install -y --fail-on-error-output git -params '"/GitAndUnixToolsOnPath"' && `
-    choco install -y --fail-on-error-output 7zip && `
-    choco install -y --fail-on-error-output ccache && `
-    choco install -y --fail-on-error-output cmake.install --installargs 'ADD_CMAKE_TO_PATH=System' && `
-    choco install -y --fail-on-error-output ninja