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

Upgrade GitHub CI/CD Workflows to Current Stable Version #144

Conversation

aj-stein-nist
Copy link
Contributor

@aj-stein-nist aj-stein-nist commented Sep 23, 2022

Committer Notes

Closes #116.

For testing, I pushed to main on my developer fork and ran GitHub Actions as if this was merged here as well:

https://github.com/aj-stein-nist/oscal-content/actions/runs/3139302623

aj-stein-nist/oscal-content@e0b05be

This is ready for review, but several things must be completed before this is valid and mergeable:

All Submissions:

  • Have you followed the guidelines in our Contributing document?
  • Have you checked to ensure there aren't other open Pull Requests for the same update/change?
  • Have you squashed any non-relevant commits and commit messages? [instructions]
  • Do all automated CI/CD checks pass?

Changes to Core Features:

  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • Have you written new tests for your core changes, as applicable?
  • Have you included examples of how to use your new feature(s)?

@aj-stein-nist aj-stein-nist self-assigned this Sep 23, 2022
@aj-stein-nist aj-stein-nist force-pushed the 116-upgrade-github-cicd-workflows-to-current-stable-version branch 6 times, most recently from d9a2472 to 84c912a Compare September 27, 2022 19:48
@aj-stein-nist aj-stein-nist changed the title [WIP] Upgrade GitHub cicd workflows to current stable version Upgrade GitHub cicd workflows to current stable version Sep 27, 2022
@aj-stein-nist aj-stein-nist force-pushed the 116-upgrade-github-cicd-workflows-to-current-stable-version branch 2 times, most recently from 590345d to b20605d Compare September 27, 2022 21:42
Make the oscal-content generation GHA workflow act similarly to the
usnistgov/OSCAL repository and update relevant third-party Actions
with tested releases from that repo as well.
We need to do this to pull in the new Maven-based pom.xml
dependency management strategy, this is not in 1.0.2.

In current master of usnistgov/OSCAL, the necessary pom.xml for Maven
was introduced and has not been modified in the current commit on
master: 9365874bfccfa385beaea64a2333b9913cdb0beb.
@aj-stein-nist aj-stein-nist force-pushed the 116-upgrade-github-cicd-workflows-to-current-stable-version branch from 87d41ad to e0b05be Compare September 27, 2022 22:05
@aj-stein-nist aj-stein-nist marked this pull request as ready for review September 27, 2022 22:05
@aj-stein-nist
Copy link
Contributor Author

@david-waltermire-nist this one is GTG. I did leave 3 separate commits for us to discuss/review prior to merge, the second for Dependabot, and most importantly and last, pulling up the submodule to make this possible using pinned deps from files. I presume the latter may or may not be desirable given release priorities and strategy here let me know.

Marking this one ready for review and feedback.

@aj-stein-nist aj-stein-nist changed the title Upgrade GitHub cicd workflows to current stable version Upgrade GitHub CI/CD Workflows to Current Stable Version Oct 4, 2022
@aj-stein-nist
Copy link
Contributor Author

After touchups in the upstream develop branch of usnistgov/OSCAL, I should come back to this quickly with a second pass later in the week and align the version numbers to cut down on GHA Dependabot churn here once it is merged immediately after.

@david-waltermire
Copy link
Contributor

@aj-stein-nist Is this ready to review and merge?

@aj-stein-nist
Copy link
Contributor Author

@aj-stein-nist Is this ready to review and merge?

It might be best if I update some of the GitHub Actions versions now that we merged a ton of them upstream in OSCAL repo as well. Give me a few minutes. I will spruce up here and ping you when it is ready.

@aj-stein-nist aj-stein-nist force-pushed the 116-upgrade-github-cicd-workflows-to-current-stable-version branch from e0b05be to a5e3165 Compare October 17, 2022 17:16
@aj-stein-nist
Copy link
Contributor Author

@david-waltermire-nist dependencies updated and this is ready for re-review. I would argue we might want to hold off on merge and discuss implications of this comment first: #144 (comment). Just reviewed previous work to make sure I didn't miss anything.

@aj-stein-nist aj-stein-nist force-pushed the 116-upgrade-github-cicd-workflows-to-current-stable-version branch from a5e3165 to 75d9ca0 Compare October 17, 2022 17:41
Copy link
Contributor

@david-waltermire david-waltermire left a comment

Choose a reason for hiding this comment

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

Thanks!

@david-waltermire david-waltermire merged commit e1a6d08 into usnistgov:main Nov 1, 2022
aj-stein-nist added a commit to aj-stein-nist/oscal-content-forked that referenced this pull request Nov 1, 2022
aj-stein-nist added a commit to aj-stein-nist/oscal-content-forked that referenced this pull request Nov 1, 2022
aj-stein-nist added a commit to aj-stein-nist/oscal-content-forked that referenced this pull request Nov 2, 2022
aj-stein-nist added a commit to aj-stein-nist/oscal-content-forked that referenced this pull request Nov 2, 2022
aj-stein-nist added a commit to aj-stein-nist/oscal-content-forked that referenced this pull request Jan 30, 2023
aj-stein-nist added a commit to usnistgov/OSCAL that referenced this pull request Feb 22, 2023
I need to follow up with Dave, but in the interim we test this for usnistgov/oscal-content#144.
aj-stein-nist added a commit to aj-stein-nist/OSCAL-forked that referenced this pull request Feb 27, 2023
I need to follow up with Dave, but in the interim we test this for usnistgov/oscal-content#144.
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.

Upgrade GitHub CI/CD Workflows to Current Stable Version
2 participants