Skip to content

Commit 4813ef1

Browse files
authored
ci: align release workflow image tag with build matrix (#268)
Rely on the default build argument values defined in the Dockerfile.
1 parent cf12386 commit 4813ef1

1 file changed

Lines changed: 7 additions & 24 deletions

File tree

.github/workflows/release.yaml

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ permissions:
1212
jobs:
1313

1414
release:
15-
runs-on: [gpu]
15+
runs-on: ubuntu-latest
1616

1717
strategy:
1818
matrix:
@@ -21,17 +21,18 @@ jobs:
2121
os: ubuntu24.04
2222
cuda_version: 13.0.2
2323
optix_version: 9.0.0
24-
geant4_version: 11.3.2
25-
cmake_version: 4.2.1
2624

2725
steps:
2826
- name: Define environment variables
2927
run: |
3028
REF_SANITIZED=$(echo "${{ github.ref_name }}" | sed 's/[^a-zA-Z0-9._-]/-/g')
29+
BUILD_VARIANT=cuda${{ matrix.cuda_version }}-${{ matrix.target }}-${{ matrix.os }}-optix${{ matrix.optix_version }}
3130
echo REF_SANITIZED=$REF_SANITIZED >> $GITHUB_ENV
31+
echo BUILD_VARIANT=$BUILD_VARIANT >> $GITHUB_ENV
3232
echo IMAGE_NAME=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
33-
echo IMAGE_TAG=${REF_SANITIZED}-${{ matrix.cuda_version }}-${{ matrix.target }}-${{ matrix.os }} >> $GITHUB_ENV
33+
echo IMAGE_TAG=${REF_SANITIZED}-${BUILD_VARIANT} >> $GITHUB_ENV
3434
echo IMAGE_TAG_SHORT=${REF_SANITIZED} >> $GITHUB_ENV
35+
echo CACHE_SCOPE=${BUILD_VARIANT} >> $GITHUB_ENV
3536
3637
- name: Checkout code
3738
uses: actions/checkout@v4
@@ -46,38 +47,20 @@ jobs:
4647
username: ${{ github.actor }}
4748
password: ${{ secrets.GITHUB_TOKEN }}
4849

49-
- name: Log in to Docker Hub
50-
uses: docker/login-action@v3
51-
with:
52-
username: ${{ secrets.DOCKERHUB_USERNAME }}
53-
password: ${{ secrets.DOCKERHUB_TOKEN }}
54-
5550
- name: Build and push to registries
5651
uses: docker/build-push-action@v6
5752
with:
5853
push: true
5954
tags: |
6055
ghcr.io/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}
6156
ghcr.io/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG_SHORT }}
62-
docker.io/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}
63-
docker.io/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG_SHORT }}
6457
target: ${{ matrix.target }}
6558
build-args: |
6659
OS=${{ matrix.os }}
6760
CUDA_VERSION=${{ matrix.cuda_version }}
6861
OPTIX_VERSION=${{ matrix.optix_version }}
69-
GEANT4_VERSION=${{ matrix.geant4_version }}
70-
CMAKE_VERSION=${{ matrix.cmake_version }}
71-
cache-from: type=local,src=/home/runner/.buildx-cache
72-
cache-to: type=local,dest=/home/runner/.buildx-cache-new,mode=max
73-
74-
- name: Move cache
75-
# Temp fix
76-
# https://github.com/docker/build-push-action/issues/252
77-
# https://github.com/moby/buildkit/issues/1896
78-
run: |
79-
rm -rf /home/runner/.buildx-cache
80-
mv /home/runner/.buildx-cache-new /home/runner/.buildx-cache
62+
cache-from: type=gha,scope=${{ env.CACHE_SCOPE }}
63+
cache-to: type=gha,mode=max,scope=${{ env.CACHE_SCOPE }}
8164

8265
cleanup:
8366
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)