From 5579a79ab4c5beaa0f95fd795d8bcc24853c60f8 Mon Sep 17 00:00:00 2001 From: David Waltermire Date: Mon, 25 Jul 2022 12:07:48 -0400 Subject: [PATCH 1/2] Update profile-resolution-specml.xml Revised text to address ambiguity around handling `oscal-version` in the generated catalog target based on the versions provided in the imports and source profile. Resolves #1272. --- .../profile-resolution/profile-resolution-specml.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/specifications/profile-resolution/profile-resolution-specml.xml b/src/specifications/profile-resolution/profile-resolution-specml.xml index cc97b90112..7930951bfa 100644 --- a/src/specifications/profile-resolution/profile-resolution-specml.xml +++ b/src/specifications/profile-resolution/profile-resolution-specml.xml @@ -1389,7 +1389,8 @@ control:

The value of metadata:version in the target MUST be set with a string that identifies the version of that document. The metadata:version SHOULD be used to track updates to this specific output document.

  • -

    The value of metadata:oscal-version in the target MUST be set with a string that identifies the version of OSCAL used by this tool to resolve the profile (ex. 1.0.0). This value MUST be determined by compiling the oscal-versions from each imported document and the source profile, and taking the most recent minor version. If this version is more recent than what the resolution tool is using, then the value of oscal-version MUST be the version that the tool used internally. If any of the above OSCAL versions (imported document versions, source profile version, tool version) are of a different major version (the first digit differs), the tool SHOULD provide an error and cease processing.

    +

    The value of metadata:oscal-version in the target MUST be set to the value of the corresponding object (oscal-version) in the source profile.

    +

    If, in processing, a resolver encounters an imported profile or catalog source whose stated oscal-version denotes a version after the oscal-version of the profile, the resolver MAY report a fatal processing error and stop processing. "After" is defined according to the [precedence rules](https://semver.org/#spec-item-11) of Semantic Versioning 2.0, in which 1.0.1 is after 1.0.1-draft.

  • The value of metadata:last-modified in the target MUST be set with a valid timestamp representing the time the profile resolution completed.

    From 09897490101789d262866cc65f5ab917f0938db6 Mon Sep 17 00:00:00 2001 From: David Waltermire Date: Mon, 25 Jul 2022 12:26:42 -0400 Subject: [PATCH 2/2] Adding swap space to resolve memory issue with Hugo build --- .github/workflows/workflow-generate-website-reference.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/workflow-generate-website-reference.yml b/.github/workflows/workflow-generate-website-reference.yml index 63fad3f900..e236875057 100644 --- a/.github/workflows/workflow-generate-website-reference.yml +++ b/.github/workflows/workflow-generate-website-reference.yml @@ -102,6 +102,11 @@ jobs: run: | cd "${{ env.BRANCH_PATH }}/build" go install -tags "extended" github.com/gohugoio/hugo + - name: Setup Swap Space + # Since Hugo is requiring more memory + uses: pierotofy/set-swap-space@49819abfb41bd9b44fb781159c033dba90353a7c + with: + swap-size-gb: 10 # Build Artifacts # --------------- - name: Generate Model Reference Documentation