Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove spaces from image name #948

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions .github/actions/upstream-test/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,7 @@ runs:
uses: firehed/multistage-docker-build-action@v1
with:
repository: >
ghcr.io/${{ github.repository_owner }}/
dagmc-ci-ubuntu-${{ inputs.ubuntu_version }}
-${{ inputs.compiler}}
-hdf5_${{ inputs.hdf5_version}}
-moab_${{ inputs.moab_version }}
-geant4_${{ inputs.geant4_version }}
-double_down_${{ inputs.double_down_version }}
ghcr.io/${{ github.repository_owner }}/dagmc-ci-ubuntu-${{ inputs.ubuntu_version }}-${{ inputs.compiler}}-hdf5_${{ inputs.hdf5_version}}-moab_${{ inputs.moab_version }}-geant4_${{ inputs.geant4_version }}-double_down_${{ inputs.double_down_version }}

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
ghcr.io/${{ github.repository_owner }}/dagmc-ci-ubuntu-${{ inputs.ubuntu_version }}-${{ inputs.compiler}}-hdf5_${{ inputs.hdf5_version}}-moab_${{ inputs.moab_version }}-geant4_${{ inputs.geant4_version }}-double_down_${{ inputs.double_down_version }}
ghcr.io/${{ github.repository_owner
}}/dagmc-ci-ubuntu-${{ inputs.ubuntu_version
}}-${{ inputs.compiler
}}-hdf5_${{ inputs.hdf5_version
}}-moab_${{ inputs.moab_version
}}-geant4_${{ inputs.geant4_version
}}-double_down_${{ inputs.double_down_version
}}

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

However, we need to give this a test run, don't know if the action actually works in this way.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or, I think we may proceed with the following code that we already used in our docker_publish.yml:

      - name: Configure docker image tag
        run: |
          image_base_tag=ghcr.io/${{ github.repository_owner }}/
          image_base_tag+=dagmc-ci-ubuntu-${{ matrix.ubuntu_version }}
          image_base_tag+=-${{ matrix.compiler}}
          image_base_tag+=-hdf5_${{ matrix.hdf5_version}}
          image_base_tag+=-moab_${{ matrix.moab_version }}
          image_base_tag+=-geant4_${{ matrix.geant4_version }}
          image_base_tag+=-double_down_${{ matrix.double_down_version }}
          echo "image_base_tag=${image_base_tag}" >> "$GITHUB_ENV"

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you make a PR with this update, I'll withdraw mine and review yours.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR #949 fixed the incorrect and introduced illegal spaces in the action.yml file.

stages: base, external_deps, hdf5, moab, dagmc
server-stage: dagmc_test
quiet: false
Expand Down
2 changes: 1 addition & 1 deletion doc/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Next version
* Update MOAB to 5.5.1 from 5.3.0 (#939 #940)
* Update README regarding OpenMC (#938)
* Simplify Housekeeping Process for DAGMC (#943)
* Allow Double Down v1.1.0 Installation in Dockerfile (#929 #944)
* Allow Double Down v1.1.0 Installation in Dockerfile (#929 #944 #948)
* Inline documentation improvements (#945)

v3.2.3
Expand Down
Loading