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

Separate out potentially useful type lists and variant utility functi… #377

Merged
merged 13 commits into from
Jun 20, 2024

Conversation

dholladay00
Copy link
Collaborator

@dholladay00 dholladay00 commented May 23, 2024

…ons to separate header files that could be used downstream w/o needing the variant definition itself.

PR Summary

@Yurlungur @jhp-lanl @gopsub @jdolence

This PR includes changes that separates potentially useful type lists and variant utility functions into separate header files that could be used by downstream codes without needing to include the variant type itself. It allows one to start with the final monolithic list of eos types (or any of the intermediate type lists) and build from there using concat, transform etc. Then the final variant's type can be constructed using the variant utility functions.

PR Checklist

  • Adds a test for any bugs fixed. Adds tests for new features.
  • Format your changes by using the make format command after configuring with cmake.
  • Document any new features, update documentation for changes made.
  • Make sure the copyright notice on any files you modified is up to date.
  • After creating a pull request, note it in the CHANGELOG.md file.
  • LANL employees: make sure tests pass both on the github CI and on the Darwin CI

If preparing for a new release, in addition please check the following:

  • Update the version in cmake.
  • Move the changes in the CHANGELOG.md file under a new header for the new release, and reset the categories.

…ons to separate header files that could be used downstream w/o needing the variant definition itself.
Copy link
Collaborator

@Yurlungur Yurlungur left a comment

Choose a reason for hiding this comment

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

I approve of exposing this machinery. Just need to make sure tests pass. Probably merits a changelog entry too.

Copy link
Collaborator

@jhp-lanl jhp-lanl left a comment

Choose a reason for hiding this comment

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

Looks good to me! And good timing! I think we'll probably be using this here soon (i.e. months) in some of the integration work

.gitlab-ci.yml Outdated
@@ -40,6 +40,8 @@ default:
id_tokens:
SITE_ID_TOKEN:
aud: https://asc-git.lanl.gov
CI_JOB_JWT:
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@rbberger is this change still needed?

Copy link
Collaborator

Choose a reason for hiding this comment

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

I have no other pipeline or project that needed that change.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

That was the change that the CI was asking for on other projects.

Copy link
Collaborator

Choose a reason for hiding this comment

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

I'm confused---do we need this change or no?

Copy link
Collaborator

@rbberger rbberger Jun 20, 2024

Choose a reason for hiding this comment

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

No. I don't think so. My theory is that re-git switched over to the new version (the thing that they were warning for many months), which deprecated CI_JOB_JWT and that there was some outdated runners still floating around while me and Karen were out. The outdated runner would then complain about not getting the no longer provided token. All it needed was to get that runner updated to accept the new SITE_ID_TOKEN, which seems to have eventually happened.

@dholladay00
Copy link
Collaborator Author

after comments are addressed by @rbberger we can merge @Yurlungur

@dholladay00
Copy link
Collaborator Author

I will need to check gitlab ci again now that I removed the ci changes.

@dholladay00
Copy link
Collaborator Author

This is passing gitlab ci, clicking the button.

@dholladay00 dholladay00 merged commit 0720a57 into main Jun 20, 2024
5 checks passed
@dholladay00 dholladay00 deleted the dholladay00/variant_helpers branch June 20, 2024 21:42
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.

4 participants