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

Modify and Update CI Testing #95

Merged
merged 54 commits into from
Apr 26, 2024
Merged

Modify and Update CI Testing #95

merged 54 commits into from
Apr 26, 2024

Conversation

connoramoreno
Copy link
Collaborator

@connoramoreno connoramoreno commented Apr 25, 2024

Rebases gh_action branch from PR #84 onto oo_version, updates installation of CAD-to-DAGMC, and modifies use of GitHub secrets.

@connoramoreno connoramoreno changed the title Add testing on GitHub via Docker image and GitHub action Modify and Update CI Testing Apr 25, 2024
@gonuke gonuke changed the base branch from gh_action to oo_version April 25, 2024 19:29
Copy link
Member

@gonuke gonuke left a comment

Choose a reason for hiding this comment

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

Some cleanup ideas that I was hoping/planning to do when I finished things up

- name: populate environment
run: |
. /opt/etc/bashrc
conda activate parastell_env
Copy link
Member

Choose a reason for hiding this comment

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

Do we need this line since it is also in the bashrc? (I'm the one who put it both places, but was going to come back and clean it up)

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I guess we should decide whether we would rather have the command executed via . /opt/etc/bashrc or run explicitly as here. What all is the bashrc used for? It seems like it's just to activate the conda environment

Copy link
Member

Choose a reason for hiding this comment

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

I think the bashrc also sets some of the path variables. We build this on top of an image that already has some version of conda installed, and the path info is in the bashrc, so I think we need to keep some of it. Happy to leave the environment activation in the action though for clarity.

Dockerfile Outdated
Comment on lines 60 to 62
RUN git clone https://github.com/svalinn/parastell.git && \
cd parastell && \
git checkout gh-action
Copy link
Member

Choose a reason for hiding this comment

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

We should probably change this to do a checkout in the GH action, and then COPY . parastell or something to copy it all into the current location. Then we always get the version associated with the current checkout.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Does the action already do a checkout via actions/checkout@v4? I'm still learning GitHub Actions so this is slightly unclear to me

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I've removed this block from the Dockerfile and everything seems to work. Is that bad practice?

Copy link
Member

Choose a reason for hiding this comment

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

No - this is OK! and probably better. We don't actually need to install parastell in the Dockerfile. The only reason to keep it may be to have a Dockerfile that can be used by others to make an image for Parastell?

Copy link
Member

Choose a reason for hiding this comment

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

And if we did want that, we might want to have a stage that stops short of installing parastell that we use for the CI image we use here.

Copy link
Member

Choose a reason for hiding this comment

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

But this Dockerfile is already tweaked so much to work in our particular way that it isn't a good basis for making a personal docker image anyway

Copy link
Member

@gonuke gonuke left a comment

Choose a reason for hiding this comment

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

This looks good now @connoramoreno - thanks for figuring out what I did wrong

@gonuke gonuke merged commit 2dc871c into oo_version Apr 26, 2024
2 checks passed
@connoramoreno connoramoreno deleted the gh-action branch April 26, 2024 20:11
connoramoreno pushed a commit that referenced this pull request Sep 10, 2024
Modify and Update CI Testing
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants