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

Revert to using firedrake-vanilla docker container #207

Merged
merged 1 commit into from
Sep 30, 2024

Conversation

JHopeCollins
Copy link
Collaborator

Once asQ could be installed as part of the firedrake-install script, I updated the asQ CI to use the Firedrake docker container with asQ installed in #180.

This was a mistake, because that docker container installs the master branch of asQ, so since that change the CI on each PR has actually been running with the master branch not the PR branch. Worse, it also hasn't been correct when running the CI on master once each PR has merged, because the docker container has the version of master from whenever the container was built, not the version of when we run it.

This PR reverts this change, so we're now back to using the vanilla firedrake docker in the CI, and installing the current branch of asQ before running the tests.

Once asQ could be installed as part of the `firedrake-install` script, I updated the asQ CI to use the Firedrake docker container with asQ installed in #180.

This was a mistake, because that docker container installs the master branch of asQ, so since that change the CI on each PR has actually been running with the master branch not the PR branch.
Worse, it also hasn't been correct when running the CI on master once each PR has merged, because the docker container has the version of master from whenever the container was built, not the version of when we run it.

This PR reverts this change, so we're now back to using the vanilla firedrake docker in the CI, and installing the current branch of asQ before running the tests.
@JHopeCollins JHopeCollins added bug Something isn't working tests unit or integration tests labels Sep 30, 2024
@JHopeCollins JHopeCollins self-assigned this Sep 30, 2024
@JHopeCollins JHopeCollins linked an issue Sep 30, 2024 that may be closed by this pull request
@JHopeCollins JHopeCollins merged commit b1a4cf9 into master Sep 30, 2024
1 check passed
@JHopeCollins JHopeCollins deleted the ci_revert_to_vanilla_docker branch September 30, 2024 10:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working tests unit or integration tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Run CI with PR branch not master
2 participants