From f1a6496dec25a253eb896c919fb882b4f766d009 Mon Sep 17 00:00:00 2001 From: Matt Westphall Date: Tue, 15 Oct 2024 15:07:22 -0500 Subject: [PATCH 1/3] add osg 24 to build matrix --- .github/workflows/build-container.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml index 48ec4cb..f2fe0b0 100644 --- a/.github/workflows/build-container.yml +++ b/.github/workflows/build-container.yml @@ -32,7 +32,7 @@ jobs: - image: 'nvidia/cuda:11.8.0-runtime-rockylinux8' tag_str: 'cuda_11_8_0' repo: ['development', 'testing', 'release'] - series: ['23'] + series: ['23', '24'] needs: make-date-tag steps: - name: checkout docker-software-base From 62c665e94a7cf37fc58dd0eb95e6eac9e7481a69 Mon Sep 17 00:00:00 2001 From: Matt Westphall Date: Thu, 17 Oct 2024 10:15:56 -0500 Subject: [PATCH 2/3] build/push to both osg-htc and opensciencegrid --- .github/workflows/build-container.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml index f2fe0b0..64af944 100644 --- a/.github/workflows/build-container.yml +++ b/.github/workflows/build-container.yml @@ -20,7 +20,7 @@ jobs: build: runs-on: ubuntu-latest - if: startsWith(github.repository, 'opensciencegrid/') + if: startsWith(github.repository, 'opensciencegrid/') || startsWith(github.repository, 'osg-htc/') strategy: fail-fast: False matrix: @@ -45,10 +45,12 @@ jobs: SERIES: ${{ matrix.series }} TIMESTAMP: ${{ needs.make-date-tag.outputs.dtag }} run: | - docker_repo=${GITHUB_REPOSITORY/opensciencegrid\/docker-/opensciencegrid/} + image_name=${GITHUB_REPOSITORY/opensciencegrid\/docker-/} tags=() for registry in hub.opensciencegrid.org docker.io; do - tags+=( $registry/$docker_repo:$SERIES-$BASE_STR-$REPO{,-$TIMESTAMP} ) + for docker_repo in opensciencegrid osg-htc; do + tags+=( $registry/$docker_repo/$image_name:$SERIES-$BASE_STR-$REPO{,-$TIMESTAMP} ) + done done # This causes the tag_list array to be comma-separated below, # which is required for build-push-action @@ -73,7 +75,7 @@ jobs: - name: Build and push Docker images uses: docker/build-push-action@v4 - continue-on-error: ${{ matrix.repo == 'development' && matrix.series == '23' }} + continue-on-error: ${{ matrix.repo == 'development' && (matrix.series == '24')}} with: context: . push: true @@ -86,7 +88,7 @@ jobs: dispatch: runs-on: ubuntu-latest - if: startsWith(github.repository, 'opensciencegrid/') + if: startsWith(github.repository, 'opensciencegrid/') || startsWith(github.repository, 'osg-htc/') needs: build strategy: matrix: From e315b88e379215192aca1fbff57d170a32653766 Mon Sep 17 00:00:00 2001 From: Matt Westphall Date: Thu, 17 Oct 2024 10:50:52 -0500 Subject: [PATCH 3/3] don't try to psuh to docker.io/osg-htc --- .github/workflows/build-container.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml index 64af944..141a61e 100644 --- a/.github/workflows/build-container.yml +++ b/.github/workflows/build-container.yml @@ -49,6 +49,9 @@ jobs: tags=() for registry in hub.opensciencegrid.org docker.io; do for docker_repo in opensciencegrid osg-htc; do + # Don't try to push to docker.io/osg-htc + [[ $docker_repo == "osg-htc" && $registry == "docker.io" ]] && continue + tags+=( $registry/$docker_repo/$image_name:$SERIES-$BASE_STR-$REPO{,-$TIMESTAMP} ) done done