Skip to content

Commit 62c665e

Browse files
committed
build/push to both osg-htc and opensciencegrid
1 parent f1a6496 commit 62c665e

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

.github/workflows/build-container.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
build:
2222
runs-on: ubuntu-latest
23-
if: startsWith(github.repository, 'opensciencegrid/')
23+
if: startsWith(github.repository, 'opensciencegrid/') || startsWith(github.repository, 'osg-htc/')
2424
strategy:
2525
fail-fast: False
2626
matrix:
@@ -45,10 +45,12 @@ jobs:
4545
SERIES: ${{ matrix.series }}
4646
TIMESTAMP: ${{ needs.make-date-tag.outputs.dtag }}
4747
run: |
48-
docker_repo=${GITHUB_REPOSITORY/opensciencegrid\/docker-/opensciencegrid/}
48+
image_name=${GITHUB_REPOSITORY/opensciencegrid\/docker-/}
4949
tags=()
5050
for registry in hub.opensciencegrid.org docker.io; do
51-
tags+=( $registry/$docker_repo:$SERIES-$BASE_STR-$REPO{,-$TIMESTAMP} )
51+
for docker_repo in opensciencegrid osg-htc; do
52+
tags+=( $registry/$docker_repo/$image_name:$SERIES-$BASE_STR-$REPO{,-$TIMESTAMP} )
53+
done
5254
done
5355
# This causes the tag_list array to be comma-separated below,
5456
# which is required for build-push-action
@@ -73,7 +75,7 @@ jobs:
7375

7476
- name: Build and push Docker images
7577
uses: docker/build-push-action@v4
76-
continue-on-error: ${{ matrix.repo == 'development' && matrix.series == '23' }}
78+
continue-on-error: ${{ matrix.repo == 'development' && (matrix.series == '24')}}
7779
with:
7880
context: .
7981
push: true
@@ -86,7 +88,7 @@ jobs:
8688

8789
dispatch:
8890
runs-on: ubuntu-latest
89-
if: startsWith(github.repository, 'opensciencegrid/')
91+
if: startsWith(github.repository, 'opensciencegrid/') || startsWith(github.repository, 'osg-htc/')
9092
needs: build
9193
strategy:
9294
matrix:

0 commit comments

Comments
 (0)