-
Notifications
You must be signed in to change notification settings - Fork 181
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
Revamp CI/CD Infrastructure, Simplify Build #1857
Revamp CI/CD Infrastructure, Simplify Build #1857
Conversation
* Replace metaschema submodule with metaschema-xslt * Remove extraneous dependencies (pom.xml, some package.json entries) Co-authored-by: Wendell Piez <[email protected]> Co-authored-by: Dmitry Cousin <[email protected]>
* Remove generate ci documentation workflow * Create `artifacts` and `checks` makefile targets
* Started a `build/` README * Added libxml2-utils to status action setup
* Advanced metaschema-xslt submodule * Added more details to the OSCAL build readme
* Downgraded MLC to 3.10.2 to mitigate intermittent "Callback was already called" errors * Artifact CI job run multiple jobs
Co-authored-by: Chris Compton <[email protected]>
Looks like we're ready for review! |
@wendellpiez may have found some regressions in the metaschemas via the new schematron tests, however any fixes will have to happen in the upstream #1856 branch after this PR is merged (to avoid diverging histories). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Initial feedback, more to follow.
Co-authored-by: A.J. Stein <[email protected]>
We talked in the standup on the diff findings so far. One other thing is that there is no directory structure in the newly generated folder, which may be ok, but we should check the filenames because some of the naming is inconsistent and that may cause headaches for integrators. On the convertors there is a dash ('-') after the model name, and we probably want to adjust that to an underscore ('_'). e.g. |
This has been solved in usnistgov/metaschema-xslt#50. @aj-stein-nist would you be comfortable reviewing this PR in Wendell's absence? It also aligns the metaschema-xslt with Kyle and your changes to the JSON schema generation stylesheet. |
The newest commit also generates archive artifacts, as seen here in this test release: https://github.com/nikitawootten-nist/OSCAL/releases/tag/untagged-94aa5a273145cbd339e9 |
So we will move from gzip from bz2? I am not preferential but we did the latter before (I pick an example release that was not one of those in the list I "backported" by manually uploading artifacts we split out). https://github.com/usnistgov/OSCAL/releases/tag/v1.0.0-milestone3 |
I think you are referring to the "Source code (tar.gz)" link that GitHub generates with all releases. The "oscal-${RELEASE}.tar.bz2" and "oscal-${RELEASE}.zip" release assets have been generated by the package release action and contain the zipped up artifacts as well as a special release readme (see https://github.com/usnistgov/OSCAL/releases/tag/v1.0.4). The archive format has been unchanged. |
My bad, the |
…-oscal-version Prepare models, bump schema version to 1.1.0
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Based on actions yesterday, I think we're in good shape.
…`nm:ERROR` when using `json` instead of `file` input #1849
One last update, Wendell and I recreated a PR made by @kylelaker that will fix #1849. |
d4e5c5c
into
usnistgov:feature-1802-oscal-pages-nosquash
…nverter (#1849) * Replaced `metaschema` submodule with `metaschema-xslt` * The `metaschema-xslt` version also fixes #1849 * Removed all bespoke scripts and replaced them with Makefile targets * Changed CI infrastructure to use the new Makefile scripts * Removed Dockerfile and infrastructure as it is no longer needed * Changed model version to `1.1.0` Co-authored-by: Wendell Piez <[email protected]> Co-authored-by: Dmitry Cousin <[email protected]> Co-authored-by: Chris Compton <[email protected]> Co-authored-by: A.J. Stein <[email protected]>
Committer Notes
Fixes #1847
Also:
metaschema-xslt
points at the correct revision ofmetaschema
(avoid duplicate submodules)build/
folder READMEnm:ERROR
when usingjson
instead offile
input #1849Note: we considering replacing markdown-link-check.
All Submissions:
By submitting a pull request, you are agreeing to provide this contribution under the CC0 1.0 Universal public domain dedication.
(For reviewers: The wiki has guidance on code review and overall issue review for completeness.)
Changes to Core Features: