From 8e8f66e07fb6fac037f60c6c76ce2146caf2e322 Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Mon, 20 Nov 2023 18:36:42 +0100 Subject: [PATCH 1/2] ci(core): add -core images without python deps Signed-off-by: Ettore Di Giacinto --- .github/workflows/image.yml | 52 +++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml index 9264d0d4163c..39d51a3e8454 100644 --- a/.github/workflows/image.yml +++ b/.github/workflows/image.yml @@ -24,11 +24,13 @@ jobs: tag-latest: 'auto' tag-suffix: '' ffmpeg: '' + image-type: 'extras' - build-type: '' platforms: 'linux/amd64' tag-latest: 'false' tag-suffix: '-ffmpeg' ffmpeg: 'true' + image-type: 'extras' - build-type: 'cublas' cuda-major-version: 11 cuda-minor-version: 7 @@ -36,6 +38,7 @@ jobs: tag-latest: 'false' tag-suffix: '-cublas-cuda11' ffmpeg: '' + image-type: 'extras' - build-type: 'cublas' cuda-major-version: 12 cuda-minor-version: 1 @@ -43,6 +46,7 @@ jobs: tag-latest: 'false' tag-suffix: '-cublas-cuda12' ffmpeg: '' + image-type: 'extras' - build-type: 'cublas' cuda-major-version: 11 cuda-minor-version: 7 @@ -50,6 +54,7 @@ jobs: tag-latest: 'false' tag-suffix: '-cublas-cuda11-ffmpeg' ffmpeg: 'true' + image-type: 'extras' - build-type: 'cublas' cuda-major-version: 12 cuda-minor-version: 1 @@ -57,6 +62,52 @@ jobs: tag-latest: 'false' tag-suffix: '-cublas-cuda12-ffmpeg' ffmpeg: 'true' + image-type: 'extras' + - build-type: '' + #platforms: 'linux/amd64,linux/arm64' + platforms: 'linux/amd64' + tag-latest: 'auto' + tag-suffix: '' + ffmpeg: '' + image-type: 'extras' + - build-type: '' + platforms: 'linux/amd64' + tag-latest: 'false' + tag-suffix: '-ffmpeg-core' + ffmpeg: 'true' + image-type: 'core' + - build-type: 'cublas' + cuda-major-version: 11 + cuda-minor-version: 7 + platforms: 'linux/amd64' + tag-latest: 'false' + tag-suffix: '-cublas-cuda11-core' + ffmpeg: '' + image-type: 'core' + - build-type: 'cublas' + cuda-major-version: 12 + cuda-minor-version: 1 + platforms: 'linux/amd64' + tag-latest: 'false' + tag-suffix: '-cublas-cuda12-core' + ffmpeg: '' + image-type: 'core' + - 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' + - build-type: 'cublas' + cuda-major-version: 12 + cuda-minor-version: 1 + platforms: 'linux/amd64' + tag-latest: 'false' + tag-suffix: '-cublas-cuda12-ffmpeg-core' + ffmpeg: 'true' + image-type: 'core' runs-on: arc-runner-set steps: @@ -145,6 +196,7 @@ jobs: CUDA_MAJOR_VERSION=${{ matrix.cuda-major-version }} CUDA_MINOR_VERSION=${{ matrix.cuda-minor-version }} FFMPEG=${{ matrix.ffmpeg }} + IMAGE_TYPE=${{ matrix.image-type }} context: . file: ./Dockerfile platforms: ${{ matrix.platforms }} From 85f402cdae9a91b9456f83e879777f1be4388898 Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Mon, 20 Nov 2023 18:40:30 +0100 Subject: [PATCH 2/2] ci(core): use public runners --- .github/workflows/image.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml index 39d51a3e8454..6caa9bd9ee7f 100644 --- a/.github/workflows/image.yml +++ b/.github/workflows/image.yml @@ -25,12 +25,14 @@ jobs: tag-suffix: '' ffmpeg: '' image-type: 'extras' + runs-on: 'arc-runner-set' - build-type: '' platforms: 'linux/amd64' tag-latest: 'false' tag-suffix: '-ffmpeg' ffmpeg: 'true' image-type: 'extras' + runs-on: 'arc-runner-set' - build-type: 'cublas' cuda-major-version: 11 cuda-minor-version: 7 @@ -39,6 +41,7 @@ jobs: tag-suffix: '-cublas-cuda11' ffmpeg: '' image-type: 'extras' + runs-on: 'arc-runner-set' - build-type: 'cublas' cuda-major-version: 12 cuda-minor-version: 1 @@ -47,6 +50,7 @@ jobs: tag-suffix: '-cublas-cuda12' ffmpeg: '' image-type: 'extras' + runs-on: 'arc-runner-set' - build-type: 'cublas' cuda-major-version: 11 cuda-minor-version: 7 @@ -55,6 +59,7 @@ jobs: tag-suffix: '-cublas-cuda11-ffmpeg' ffmpeg: 'true' image-type: 'extras' + runs-on: 'arc-runner-set' - build-type: 'cublas' cuda-major-version: 12 cuda-minor-version: 1 @@ -63,6 +68,7 @@ jobs: tag-suffix: '-cublas-cuda12-ffmpeg' ffmpeg: 'true' image-type: 'extras' + runs-on: 'arc-runner-set' - build-type: '' #platforms: 'linux/amd64,linux/arm64' platforms: 'linux/amd64' @@ -70,12 +76,14 @@ jobs: tag-suffix: '' ffmpeg: '' image-type: 'extras' + runs-on: 'arc-runner-set' - build-type: '' platforms: 'linux/amd64' tag-latest: 'false' tag-suffix: '-ffmpeg-core' ffmpeg: 'true' image-type: 'core' + runs-on: 'ubuntu-latest' - build-type: 'cublas' cuda-major-version: 11 cuda-minor-version: 7 @@ -84,6 +92,7 @@ jobs: tag-suffix: '-cublas-cuda11-core' ffmpeg: '' image-type: 'core' + runs-on: 'ubuntu-latest' - build-type: 'cublas' cuda-major-version: 12 cuda-minor-version: 1 @@ -92,6 +101,7 @@ jobs: tag-suffix: '-cublas-cuda12-core' ffmpeg: '' image-type: 'core' + runs-on: 'ubuntu-latest' - build-type: 'cublas' cuda-major-version: 11 cuda-minor-version: 7 @@ -100,6 +110,7 @@ jobs: tag-suffix: '-cublas-cuda11-ffmpeg-core' ffmpeg: 'true' image-type: 'core' + runs-on: 'ubuntu-latest' - build-type: 'cublas' cuda-major-version: 12 cuda-minor-version: 1 @@ -108,8 +119,9 @@ jobs: tag-suffix: '-cublas-cuda12-ffmpeg-core' ffmpeg: 'true' image-type: 'core' + runs-on: 'ubuntu-latest' - runs-on: arc-runner-set + runs-on: ${{ matrix.runs-on }} steps: - name: Force Install GIT latest run: |