From 01f92c6f894264b9c31986cc984e9e0b02d76854 Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Sat, 26 Apr 2025 18:40:20 +0200 Subject: [PATCH] chore(ci): build only images with ffmpeg included, simplify tags Signed-off-by: Ettore Di Giacinto --- .github/workflows/image.yml | 127 +++--------------------------------- 1 file changed, 10 insertions(+), 117 deletions(-) diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml index d44c72546ef9..3e216b31375c 100644 --- a/.github/workflows/image.yml +++ b/.github/workflows/image.yml @@ -45,7 +45,7 @@ jobs: - build-type: 'hipblas' platforms: 'linux/amd64' tag-latest: 'auto' - tag-suffix: '-hipblas-ffmpeg' + tag-suffix: '-hipblas' ffmpeg: 'true' image-type: 'extras' aio: "-aio-gpu-hipblas" @@ -58,17 +58,7 @@ jobs: - build-type: 'hipblas' platforms: 'linux/amd64' tag-latest: 'false' - tag-suffix: '-hipblas' - ffmpeg: 'false' - image-type: 'extras' - base-image: "rocm/dev-ubuntu-22.04:6.1" - grpc-base-image: "ubuntu:22.04" - runs-on: 'arc-runner-set' - makeflags: "--jobs=3 --output-sync=target" - - build-type: 'hipblas' - platforms: 'linux/amd64' - tag-latest: 'false' - tag-suffix: '-hipblas-ffmpeg-core' + tag-suffix: '-hipblas-core' ffmpeg: 'true' image-type: 'core' base-image: "rocm/dev-ubuntu-22.04:6.1" @@ -76,16 +66,6 @@ jobs: runs-on: 'arc-runner-set' makeflags: "--jobs=3 --output-sync=target" latest-image: 'latest-gpu-hipblas-core' - - build-type: 'hipblas' - platforms: 'linux/amd64' - tag-latest: 'false' - tag-suffix: '-hipblas-core' - ffmpeg: 'false' - image-type: 'core' - base-image: "rocm/dev-ubuntu-22.04:6.1" - grpc-base-image: "ubuntu:22.04" - runs-on: 'arc-runner-set' - makeflags: "--jobs=3 --output-sync=target" self-hosted-jobs: uses: ./.github/workflows/image_build.yml with: @@ -115,54 +95,21 @@ jobs: max-parallel: ${{ github.event_name != 'pull_request' && 5 || 8 }} matrix: include: - # Extra images - build-type: '' - #platforms: 'linux/amd64,linux/arm64' platforms: 'linux/amd64' tag-latest: 'auto' tag-suffix: '' - ffmpeg: '' - image-type: 'extras' - runs-on: 'arc-runner-set' - base-image: "ubuntu:22.04" - makeflags: "--jobs=3 --output-sync=target" - - build-type: '' - platforms: 'linux/amd64' - tag-latest: 'auto' - tag-suffix: '-ffmpeg' ffmpeg: 'true' image-type: 'extras' runs-on: 'arc-runner-set' base-image: "ubuntu:22.04" makeflags: "--jobs=3 --output-sync=target" - - build-type: 'cublas' - cuda-major-version: "11" - cuda-minor-version: "7" - platforms: 'linux/amd64' - tag-latest: 'false' - tag-suffix: '-cublas-cuda11' - ffmpeg: '' - image-type: 'extras' - runs-on: 'arc-runner-set' - base-image: "ubuntu:22.04" - makeflags: "--jobs=3 --output-sync=target" - - build-type: 'cublas' - cuda-major-version: "12" - cuda-minor-version: "0" - platforms: 'linux/amd64' - tag-latest: 'false' - tag-suffix: '-cublas-cuda12' - ffmpeg: '' - image-type: 'extras' - runs-on: 'arc-runner-set' - base-image: "ubuntu:22.04" - makeflags: "--jobs=3 --output-sync=target" - build-type: 'cublas' cuda-major-version: "11" cuda-minor-version: "7" platforms: 'linux/amd64' tag-latest: 'auto' - tag-suffix: '-cublas-cuda11-ffmpeg' + tag-suffix: '-cublas-cuda11' ffmpeg: 'true' image-type: 'extras' runs-on: 'arc-runner-set' @@ -176,7 +123,7 @@ jobs: cuda-minor-version: "0" platforms: 'linux/amd64' tag-latest: 'auto' - tag-suffix: '-cublas-cuda12-ffmpeg' + tag-suffix: '-cublas-cuda12' ffmpeg: 'true' image-type: 'extras' runs-on: 'arc-runner-set' @@ -185,22 +132,12 @@ jobs: latest-image: 'latest-gpu-nvidia-cuda-12' latest-image-aio: 'latest-aio-gpu-nvidia-cuda-12' makeflags: "--jobs=3 --output-sync=target" - - build-type: '' - #platforms: 'linux/amd64,linux/arm64' - platforms: 'linux/amd64' - tag-latest: 'auto' - tag-suffix: '' - ffmpeg: '' - image-type: 'extras' - base-image: "ubuntu:22.04" - runs-on: 'arc-runner-set' - makeflags: "--jobs=3 --output-sync=target" - build-type: 'sycl_f16' platforms: 'linux/amd64' tag-latest: 'auto' base-image: "quay.io/go-skynet/intel-oneapi-base:latest" grpc-base-image: "ubuntu:22.04" - tag-suffix: '-sycl-f16-ffmpeg' + tag-suffix: '-sycl-f16' ffmpeg: 'true' image-type: 'extras' runs-on: 'arc-runner-set' @@ -213,7 +150,7 @@ jobs: tag-latest: 'auto' base-image: "quay.io/go-skynet/intel-oneapi-base:latest" grpc-base-image: "ubuntu:22.04" - tag-suffix: '-sycl-f32-ffmpeg' + tag-suffix: '-sycl-f32' ffmpeg: 'true' image-type: 'extras' runs-on: 'arc-runner-set' @@ -228,26 +165,6 @@ jobs: base-image: "quay.io/go-skynet/intel-oneapi-base:latest" grpc-base-image: "ubuntu:22.04" tag-suffix: '-sycl-f16-core' - ffmpeg: 'false' - image-type: 'core' - runs-on: 'arc-runner-set' - makeflags: "--jobs=3 --output-sync=target" - - build-type: 'sycl_f32' - platforms: 'linux/amd64' - tag-latest: 'false' - base-image: "quay.io/go-skynet/intel-oneapi-base:latest" - grpc-base-image: "ubuntu:22.04" - tag-suffix: '-sycl-f32-core' - ffmpeg: 'false' - image-type: 'core' - runs-on: 'arc-runner-set' - makeflags: "--jobs=3 --output-sync=target" - - build-type: 'sycl_f16' - platforms: 'linux/amd64' - tag-latest: 'false' - base-image: "quay.io/go-skynet/intel-oneapi-base:latest" - grpc-base-image: "ubuntu:22.04" - tag-suffix: '-sycl-f16-ffmpeg-core' ffmpeg: 'true' image-type: 'core' runs-on: 'arc-runner-set' @@ -258,7 +175,7 @@ jobs: tag-latest: 'false' base-image: "quay.io/go-skynet/intel-oneapi-base:latest" grpc-base-image: "ubuntu:22.04" - tag-suffix: '-sycl-f32-ffmpeg-core' + tag-suffix: '-sycl-f32-core' ffmpeg: 'true' image-type: 'core' runs-on: 'arc-runner-set' @@ -296,7 +213,7 @@ jobs: - build-type: '' platforms: 'linux/amd64,linux/arm64' tag-latest: 'auto' - tag-suffix: '-ffmpeg-core' + tag-suffix: '-core' ffmpeg: 'true' image-type: 'core' base-image: "ubuntu:22.04" @@ -312,30 +229,6 @@ jobs: platforms: 'linux/amd64' tag-latest: 'false' tag-suffix: '-cublas-cuda11-core' - ffmpeg: '' - image-type: 'core' - base-image: "ubuntu:22.04" - runs-on: 'arc-runner-set' - makeflags: "--jobs=4 --output-sync=target" - skip-drivers: 'false' - - build-type: 'cublas' - cuda-major-version: "12" - cuda-minor-version: "0" - platforms: 'linux/amd64' - tag-latest: 'false' - tag-suffix: '-cublas-cuda12-core' - ffmpeg: '' - image-type: 'core' - base-image: "ubuntu:22.04" - runs-on: 'arc-runner-set' - makeflags: "--jobs=4 --output-sync=target" - skip-drivers: 'false' - - build-type: 'cublas' - cuda-major-version: "11" - cuda-minor-version: "7" - platforms: 'linux/amd64' - tag-latest: 'false' - tag-suffix: '-cublas-cuda11-ffmpeg-core' ffmpeg: 'true' image-type: 'core' runs-on: 'arc-runner-set' @@ -348,7 +241,7 @@ jobs: cuda-minor-version: "0" platforms: 'linux/amd64' tag-latest: 'false' - tag-suffix: '-cublas-cuda12-ffmpeg-core' + tag-suffix: '-cublas-cuda12-core' ffmpeg: 'true' image-type: 'core' runs-on: 'arc-runner-set' @@ -359,7 +252,7 @@ jobs: - build-type: 'vulkan' platforms: 'linux/amd64' tag-latest: 'false' - tag-suffix: '-vulkan-ffmpeg-core' + tag-suffix: '-vulkan-core' ffmpeg: 'true' image-type: 'core' runs-on: 'arc-runner-set'