Add osg-htc Harbor project support - #316
Closed
brianhlin wants to merge 3 commits into
Closed
Conversation
We seemingly drop this on the floor, otherwise jq chokes on this input
There was a problem hiding this comment.
Pull request overview
This PR updates the container build workflow to support building images from both the existing opensciencegrid/... tree and a new osg-htc/... tree by carrying the full image directory path through the job matrix and using that as the build context.
Changes:
- Update
scripts/build-job-matrix.pyto emit the full image directory path in the matrixnamefield (instead of basename). - Update the GitHub Actions workflow to detect image directories under both
opensciencegrid/andosg-htc/, and to usematrix.namedirectly as the buildcontext. - Remove a previously required
tail -n +2workaround by removing the script’s debug print.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| scripts/build-job-matrix.py | Matrix entries now keep the full org/image directory path to support multiple org roots. |
| .github/workflows/build-containers.yml | Expands image discovery to opensciencegrid/ and osg-htc/, and uses full paths as build contexts. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
90
to
94
| # Run Python script and capture JSON output | ||
| matrix_json=$(python scripts/build-job-matrix.py ${{ steps.image-list.outputs.images }} | tail -n +2) | ||
| matrix_json=$(python scripts/build-job-matrix.py ${{ steps.image-list.outputs.images }}) | ||
| # Use jq to extract the 'include' part of the JSON | ||
| matrix=$(echo "$matrix_json" | jq -c '.include') | ||
| echo "::set-output name=matrix::$matrix" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Expanding on the commit in #308 . This might work out of the box -- the account appears to have
osg-htcpush permissions