Skip to content

Commit

Permalink
Support base containers without an EUPS tag in build-service.yml.
Browse files Browse the repository at this point in the history
This gives us more flexibility in how we source the base container.
However, when there is no EUPS tag, the container labeling is much more
sensitive to how the workflow is started.
  • Loading branch information
kfindeisen committed Jun 27, 2024
1 parent d78bbcc commit 975e88b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}
- name: Determine eups tag
run: |
docker run ghcr.io/${{ github.repository_owner }}/prompt-base:"$BASE_TAG" bash -c "cat stack/miniconda*/ups_db/global.tags" > eups.tag
docker run ghcr.io/${{ github.repository_owner }}/prompt-base:"$BASE_TAG" bash -c "cat stack/miniconda*/ups_db/global.tags" > eups.tag || echo "Unknown" > eups.tag
echo "Eups tag = $(< eups.tag)"
- name: Build image
run: |
Expand All @@ -122,7 +122,7 @@ jobs:
docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
docker push $IMAGE_ID:$VERSION
EUPS_TAG=$(< eups.tag)
if [ "$BASE_TAG" != "$EUPS_TAG" ]; then
if [ "$EUPS_TAG" != "Unknown" && "$BASE_TAG" != "$EUPS_TAG" ]; then
if [ "$BRANCH" == "main" ]; then
VERSION="$EUPS_TAG"
else
Expand Down

0 comments on commit 975e88b

Please sign in to comment.