Skip to content

Commit

Permalink
Support lsstinstall in EUPS tag queries.
Browse files Browse the repository at this point in the history
Currently, the best way to get the EUPS tag is to manually read ups_db.
Later containers may include the tag as a container label.
newinstall-based containers are supported as a fallback option.
  • Loading branch information
kfindeisen committed Aug 5, 2024
1 parent 3aa6662 commit 5328c86
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
fi
echo "Docker tag = $(< lsst.docker.tag)"
echo "Stack tag = $(< stack.tag)"
docker run "$PIPE_CONTAINER":"$(< lsst.docker.tag)" bash -c "cat stack/miniconda*/ups_db/global.tags" > eups.tag || echo "Unknown" > eups.tag
docker run "$PIPE_CONTAINER":"$(< lsst.docker.tag)" bash -c "cat stack/conda/envs/lsst-scipipe-*/share/eups/ups_db/global.tags" > eups.tag || docker run "$PIPE_CONTAINER":"$(< lsst.docker.tag)" bash -c "cat stack/miniconda*/ups_db/global.tags" > eups.tag || echo "Unknown" > eups.tag
echo "Eups tag = $(< eups.tag)"
- name: Build image
# Context-free build
Expand Down
2 changes: 1 addition & 1 deletion .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 || echo "Unknown" > eups.tag
docker run ghcr.io/${{ github.repository_owner }}/prompt-base:"$BASE_TAG" bash -c "cat stack/conda/envs/lsst-scipipe-*/share/eups/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 Down

0 comments on commit 5328c86

Please sign in to comment.