Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
119 commits
Select commit Hold shift + click to select a range
f6d70c7
Release 1.0 metaschema adjustments (#1065)
Dec 9, 2021
b41033b
reverting part constraints, since these are already handled
Jan 31, 2022
a1474f0
Profile resolver selection: XSpec additions and minor XSLT enhancemen…
galtm Feb 4, 2022
e6b837b
Use XSpec variable instead of entity (#1136)
galtm Feb 28, 2022
71ce039
Nonrecursive UUID functions plus XSpec tests (#1158)
galtm Feb 28, 2022
0dfcf91
Iterate over sequence of characters, not positions (#1163)
galtm Mar 29, 2022
1e547a3
Profile resolver: Metadata tests and way of determining top UUID (#1175)
galtm Apr 15, 2022
690b967
Test merge phase, plus minor XSLT enhancements (#1207)
galtm May 4, 2022
42eb7fb
Publishing generated metaschema resources [ci skip]
david-waltermire-nist May 17, 2022
9de71bd
Support for control mapping (#1150)
Jul 5, 2022
3f1189a
Publishing generated metaschema resources [ci skip]
david-waltermire-nist Jul 5, 2022
e1b0a6b
Update metaschema
Jul 6, 2022
9e9e29d
Publishing generated metaschema resources [ci skip]
david-waltermire-nist Jul 6, 2022
0a1a2c1
Bump ajv-cli from 4.2.0 to 5.0.0 in /build (#1354)
dependabot[bot] Jul 13, 2022
a5f4ed5
Bump peter-evans/create-issue-from-file from 3.0.0 to 4 (#1355)
dependabot[bot] Jul 13, 2022
aeb04b4
Bump actions/setup-java from 2 to 3 (#1360)
dependabot[bot] Jul 13, 2022
c079b62
Bump actions/setup-node from 2 to 3 (#1359)
dependabot[bot] Jul 13, 2022
a165fd3
Bump stefanzweifel/git-auto-commit-action from 4.9.2 to 4.14.1 (#1357)
dependabot[bot] Jul 13, 2022
7872b1b
Bump github.com/gohugoio/hugo from 0.83.1 to 0.101.0 in /build (#1358)
dependabot[bot] Jul 14, 2022
3e10496
Updating to latest metaschema toolchain. Resolves 1338
Jul 14, 2022
40c5ba1
Fixes to correct metaschema validation errors.
Jul 14, 2022
08372c8
Publishing generated metaschema resources [ci skip]
david-waltermire-nist Jul 14, 2022
e7b00fe
Bump Saxon-HE from 10.6 to 10.8 in /build (#1375)
dependabot[bot] Jul 15, 2022
802c275
Bump actions/setup-node from 3.4.0 to 3.4.1 (#1374)
dependabot[bot] Jul 15, 2022
a52b8c7
Bump xmlcalabash from 1.2.5-100 to 1.4.1-100 in /build (#1363)
dependabot[bot] Jul 15, 2022
972dc1a
Bump golang from 1.18.3-bullseye to 1.18.4-bullseye in /build (#1361)
dependabot[bot] Jul 15, 2022
232f69b
Update metaschema-docs
Jul 22, 2022
5985a53
Profile Resolution Spec clarification: validation of imported catalog…
wendellpiez Jul 25, 2022
9a73a13
Clarify how to determine target catalog `oscal-version` (#1386)
Jul 25, 2022
197f9c7
Profile Resolution spec: updated names of 'remove' directives (#1381)
wendellpiez Jul 25, 2022
69f3fb1
Test finish phase, plus minor XSLT enhancements and fixes (#1377)
galtm Jul 25, 2022
4d402e4
Follow keep instruction for back-matter resources (#1378)
galtm Jul 25, 2022
3e8537a
Bump lycheeverse/lychee-action from 1.5.0 to 1.5.1 (#1390)
dependabot[bot] Aug 11, 2022
c06cf4f
Bump golang from 1.18.4-bullseye to 1.19.0-bullseye in /build (#1402)
dependabot[bot] Aug 11, 2022
b3ca87f
Add remarks field to Profile model modify.alter (add/remove). #1018 (…
Aug 11, 2022
bbe64eb
Publishing generated metaschema resources [ci skip]
david-waltermire-nist Aug 11, 2022
68b289d
Profile alter model adjustments (#1418)
Aug 17, 2022
c3653e7
Publishing generated metaschema resources [ci skip]
david-waltermire-nist Aug 17, 2022
ba44745
Added legacy Withdrawn status with deprecation entry (#1419)
Aug 18, 2022
69a3f1d
Bump actions/github-script from 6.1.0 to 6.1.1 (#1415)
dependabot[bot] Aug 21, 2022
c7902d6
Add grouping construct to props for usnistgov/OSCAL#1064. (#1412)
aj-stein-nist Aug 21, 2022
3b5aa08
Updates mapping model documentation to fix a copy and paste error. (#…
Aug 21, 2022
ed50b75
Publishing generated metaschema resources [ci skip]
david-waltermire-nist Aug 21, 2022
2c41f0f
Add assessment-assets assembly to local-definitions assembly in POAM …
Aug 21, 2022
93949aa
Publishing generated metaschema resources [ci skip]
david-waltermire-nist Aug 21, 2022
b0f005e
Fixing broken links
Aug 23, 2022
ae198df
Fixed broken links.
Aug 23, 2022
d889ebe
More broken link fixes.
Aug 23, 2022
02bdec6
Adding link to whitelist
Aug 23, 2022
d2a011f
Bump actions/cache from 3.0.5 to 3.0.8 (#1422)
dependabot[bot] Aug 23, 2022
72d35d5
Bump actions/setup-go from 3.2.0 to 3.3.0 (#1425)
dependabot[bot] Aug 25, 2022
a8bc96c
Create `<define-assembly name="impact">` (fix #1129) (#1171)
guyzyl Aug 25, 2022
26e226a
Publishing generated metaschema resources [ci skip]
david-waltermire-nist Aug 25, 2022
8d92480
imported-from relations for usnistgov/OSCAL#1023. (#1403)
aj-stein-nist Aug 31, 2022
eed2495
Fixed errors in profile resolution top-level tests based on content e…
Sep 9, 2022
4847e3e
Update metaschema submodule for usnistgov/OSCAL#1454. (#1455)
aj-stein-nist Sep 19, 2022
ee2343f
Publishing generated metaschema resources [ci skip]
aj-stein-nist Sep 19, 2022
dcdf2f8
Added JSON value key for relationship type. This missing value key wa…
Sep 20, 2022
f1d138a
Publishing generated metaschema resources [ci skip]
david-waltermire-nist Sep 20, 2022
84634bc
Add actions assembly to encode an action (i.e. approval) and its role…
aj-stein-nist Sep 26, 2022
2371e80
Publishing generated metaschema resources [ci skip]
david-waltermire-nist Sep 26, 2022
791f6b1
Implement opr:oscal-version and v:compare functions. (#1420)
galtm Sep 27, 2022
6f775a4
Updates to OSCAL Metaschema documentation and constraints (#1263)
Sep 27, 2022
6ecadba
Test modify phase, plus minor XSLT enhancements (#1321)
galtm Sep 27, 2022
1070e9b
Publishing generated metaschema resources [ci skip]
david-waltermire-nist Sep 27, 2022
24a984b
Bump actions/cache from 3.0.8 to 3.0.10 (#1486)
dependabot[bot] Oct 4, 2022
aa03f14
Bump ncipollo/release-action from 1.10.0 to 1.11.0 (#1487)
dependabot[bot] Oct 4, 2022
69ea72c
Bump actions/github-script from 6.1.1 to 6.3.1 (#1485)
dependabot[bot] Oct 4, 2022
2fdc0ea
Bump actions/setup-node from 3.4.1 to 3.5.0 (#1481)
dependabot[bot] Oct 4, 2022
4d2eafe
Bump actions/setup-java from 3.4.1 to 3.5.1 (#1476)
dependabot[bot] Oct 4, 2022
964cd4f
Bump actions/checkout from 3.0.2 to 3.1.0 (#1488)
dependabot[bot] Oct 4, 2022
ebd841c
Bump stefanzweifel/git-auto-commit-action from 4.14.1 to 4.15.0 (#1472)
dependabot[bot] Oct 4, 2022
dbfb218
Bump golang from 1.19.0-bullseye to 1.19.1-bullseye in /build (#1446)
dependabot[bot] Oct 4, 2022
3a45f0c
Updated data type documentation adding a note about why NCName was de…
Oct 4, 2022
8fdba8b
Bump github.com/gohugoio/hugo from 0.101.0 to 0.104.3 in /build (#1489)
dependabot[bot] Oct 4, 2022
35c42e1
Bump golang from 1.19.1-bullseye to 1.19.2-bullseye in /build (#1491)
dependabot[bot] Oct 5, 2022
c33ce2a
Bump xmlcalabash from 1.4.1-100 to 1.5.1-100 in /build (#1492)
dependabot[bot] Oct 5, 2022
0a55df0
Bump stefanzweifel/git-auto-commit-action from 4.15.0 to 4.15.1 (#1500)
dependabot[bot] Oct 11, 2022
07b13f5
Bump actions/github-script from 6.3.1 to 6.3.2 (#1504)
dependabot[bot] Oct 12, 2022
704b283
Bump actions/github-script from 6.3.2 to 6.3.3 (#1510)
dependabot[bot] Oct 17, 2022
480d9de
Bump actions/cache from 3.0.10 to 3.0.11 (#1512)
dependabot[bot] Oct 17, 2022
f61f84f
Bump actions/setup-node from 3.5.0 to 3.5.1 (#1511)
dependabot[bot] Oct 17, 2022
126d535
Support additional control-origination props #784 (#1460)
Oct 17, 2022
4c8dd04
POAM related finding support, fixes #1120 (#1478)
Oct 17, 2022
5bc17ab
Publishing generated metaschema resources [ci skip]
david-waltermire-nist Oct 17, 2022
a37c965
Fix broken uri-use page links in updated reference docs of develop br…
aj-stein-nist Oct 31, 2022
92ec6fb
Bump golang from 1.18.3-bullseye to 1.18.4-bullseye in /build (#1361)…
dependabot[bot] Oct 31, 2022
ef62215
Bump golang from 1.18.3-bullseye to 1.18.4-bullseye in /build (#1361)…
dependabot[bot] Oct 31, 2022
25804ef
Bump golang from 1.18.3-bullseye to 1.18.4-bullseye in /build (#1361)…
dependabot[bot] Oct 31, 2022
9496e17
Bump golang from 1.18.3-bullseye to 1.18.4-bullseye in /build (#1361)…
dependabot[bot] Oct 31, 2022
ee9d899
Bump golang from 1.18.3-bullseye to 1.18.4-bullseye in /build (#1361)…
dependabot[bot] Oct 31, 2022
11ab178
Publishing generated metaschema resources [ci skip]
oscalbuilder Oct 31, 2022
9687cc2
Bump golang from 1.18.3-bullseye to 1.18.4-bullseye in /build (#1361)…
dependabot[bot] Nov 1, 2022
23e9cdd
Add profile checks with Schematron for usnistgov/oscal-content#128. (…
aj-stein-nist Nov 1, 2022
4fd2849
reduced the amount of 'OSCAL' references in data type documentation. …
Nov 1, 2022
63cfcf1
Bump peaceiris/actions-gh-pages from 3.8.0 to 3.9.0 (#1537)
dependabot[bot] Nov 1, 2022
23f81dc
Bump actions/upload-artifact from 3.1.0 to 3.1.1 (#1536)
dependabot[bot] Nov 1, 2022
8a951dc
Bump stefanzweifel/git-auto-commit-action from 4.15.1 to 4.15.3 (#1535)
dependabot[bot] Nov 1, 2022
a095278
Add possible Schematron documentation checks (#1501)
aj-stein-nist Nov 1, 2022
5d9b008
Publishing generated metaschema resources [ci skip]
oscalbuilder Nov 1, 2022
a52aa15
Added resource-fragment flag to link. (#1527)
Nov 1, 2022
69cc108
Publishing generated metaschema resources [ci skip]
oscalbuilder Nov 1, 2022
3f114c0
Bump golang from 1.19.2-bullseye to 1.19.3-bullseye in /build (#1538)
dependabot[bot] Nov 2, 2022
b08d9b7
Adds a constraint and index of by-component objects to support provid…
Nov 2, 2022
d5ccf97
Bump actions/setup-java from 3.6.0 to 3.7.0 (#1566)
dependabot[bot] Dec 7, 2022
7a2d30c
Bump ncipollo/release-action from 1.11.0 to 1.11.2 (#1565)
dependabot[bot] Dec 7, 2022
ffb26ae
Bump actions/setup-go from 3.3.1 to 3.4.0 (#1564)
dependabot[bot] Dec 7, 2022
734cc6c
Bump stefanzweifel/git-auto-commit-action from 4.15.3 to 4.16.0 (#1563)
dependabot[bot] Dec 7, 2022
c2ebb49
Bump maven-dependency-plugin from 3.3.0 to 3.4.0 in /build (#1562)
dependabot[bot] Dec 7, 2022
98064bc
Bump github.com/gohugoio/hugo from 0.105.0 to 0.107.0 in /build (#1558)
dependabot[bot] Dec 7, 2022
4574947
Bump lycheeverse/lychee-action from 1.5.1 to 1.5.4 (#1547)
dependabot[bot] Dec 7, 2022
11ab39d
Bump actions/setup-java (#1576)
dependabot[bot] Dec 7, 2022
d82023e
Bump github.com/gohugoio/hugo from 0.107.0 to 0.108.0 in /build (#1578)
dependabot[bot] Dec 7, 2022
5423bfd
Bump golang from 1.19.3-bullseye to 1.19.4-bullseye in /build (#1577)
dependabot[bot] Dec 7, 2022
5be47c5
Fixed syntax errors in metapaths (#1574)
Dec 7, 2022
d6dd542
Fixed improper use of allowed-values/allow-other. Ensured that all pr…
Dec 7, 2022
07a4981
Bump xmlcalabash from 1.5.1-100 to 1.5.3-110 in /build (#1575)
dependabot[bot] Dec 7, 2022
ed1150a
Publishing generated metaschema resources [ci skip]
oscalbuilder Dec 7, 2022
cbc3c0e
Bump docs/themes/uswds from `631e114` to `ac7915f`
dependabot[bot] Jan 9, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/issue-triage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ jobs:
if: github.event.action == 'opened'
steps:
- name: Add New Issues to Issue Triage Board
uses: peter-evans/create-or-update-project-card@866533e2ae61f13c35fd1d374049713fab43c729
uses: peter-evans/create-or-update-project-card@5eacbbd224b7814354861b555cc18a8359e2cebe
with:
project-name: Issue Triage
column-name: Needs Triage
removeCard:
runs-on: ubuntu-20.04
if: github.event.action == 'closed'
steps:
- uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
- uses: alex-page/github-project-automation-plus@1f8873e97e3c8f58161a323b7c568c1f623a1c4d
with:
project: Issue Triage
column: Done
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/package-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
# use this for main repo master builds
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
with:
path: ${{ env.OSCAL_HOME }}
submodules: recursive
Expand All @@ -38,14 +38,14 @@ jobs:
bash "${OSCAL_CICD_PATH}/package-release.sh" "${OSCAL_WORKING_PATH}"
tar -jcvf "${OSCAL_WORKING_PATH}/${RELEASE_NAME}.tar.bz2" -C "${OSCAL_WORKING_PATH}/archive" .
(cd "${OSCAL_WORKING_PATH}/archive" && zip -r "../${RELEASE_NAME}.zip" .)
- uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8
- uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb
with:
name: release-artifacts
path: |
${{ env.OSCAL_WORKING_PATH }}/${{ env.RELEASE_NAME }}.tar.bz2
${{ env.OSCAL_WORKING_PATH }}/${{ env.RELEASE_NAME }}.zip
retention-days: 5
- uses: ncipollo/release-action@58ae73b360456532aafd58ee170c045abbeaee37
- uses: ncipollo/release-action@18eadf9c9b0f226f47f164f5373c6a44f0aae169
with:
name: OSCAL ${{ env.RELEASE_VERSION }} Release
allowUpdates: false
Expand Down
26 changes: 19 additions & 7 deletions .github/workflows/workflow-generate-metaschema-resources.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
# use this for builds triggered from the UI on protected branches
- name: Checkout Latest (using COMMIT_TOKEN)
if: github.event_name == 'workflow_dispatch' && github.event.inputs.commit_resources == 'true'
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
with:
path: ${{ env.CHECKOUT_PATH }}
token: ${{ secrets.COMMIT_TOKEN }}
Expand All @@ -45,7 +45,7 @@ jobs:
# use this for builds triggered from other workflows on protected branches
- name: Checkout Latest (using access_token)
if: github.event_name == 'push' && inputs.commit_resources == true
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
with:
path: ${{ env.CHECKOUT_PATH }}
token: ${{ secrets.access_token }}
Expand All @@ -54,7 +54,7 @@ jobs:
# use this for overything else (i.e., pull requests) where publication is not needed
- name: Checkout Latest
if: steps.checkout_latest_workflow.conclusion == 'skipped' && steps.checkout_latest_push.conclusion == 'skipped'
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
with:
path: ${{ env.CHECKOUT_PATH }}
submodules: recursive
Expand All @@ -66,7 +66,7 @@ jobs:
# -------------------------
# Java JDK 11
- name: Set up JDK
uses: actions/setup-java@f0bb91606209742fe3ea40199be2f3ef195ecabf
uses: actions/setup-java@c3ac5dd0ed8db40fedb61c32fbe677e6b355e94c
with:
java-version: 11
distribution: 'temurin'
Expand All @@ -77,7 +77,7 @@ jobs:
mkdir -p "${JAVA_CLASSPATH}"
mvn dependency:copy-dependencies -DoutputDirectory="${JAVA_CLASSPATH}"
- name: Set up NodeJS
uses: actions/setup-node@1f8c6b94b26d0feae1e387ca63ccbdc44d27b561
uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516
with:
node-version-file: '${{ env.CHECKOUT_PATH }}/build/.nvmrc'
cache: 'npm'
Expand Down Expand Up @@ -119,18 +119,30 @@ jobs:
run: |
zip ${{ runner.temp }}/metaschema-artifacts.zip -r xml/schema/*.xsd json/schema/*.json xml/convert/*.xsl json/convert/*.xsl
working-directory: ${{ env.CHECKOUT_PATH }}
- uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8
- name: Zip Schematron Validation Results for Debugging
if: always()
run: |
zip ${{ runner.temp }}/schematron-validations.zip -r ${{ runner.temp }} build/metaschema/toolchains/xslt-M4/validate/metaschema-composition-check-compiled.xsl
working-directory: ${{ env.CHECKOUT_PATH }}
- uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb
with:
name: schemas-and-converters
path: |
${{ runner.temp }}/metaschema-artifacts.zip
retention-days: 5
- uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8
if: always()
with:
name: schematron-validation-reports
path: |
${{ runner.temp }}/schematron-validations.zip
retention-days: 5
# Store Built Artifacts
# ---------------
- name: Publish Schemas and Converters
# only do this on master
if: github.event.inputs.commit_resources == 'true' || inputs.commit_resources == true
uses: stefanzweifel/git-auto-commit-action@be7095c202abcf573b09f20541e0ee2f6a3a9d9b
uses: stefanzweifel/git-auto-commit-action@3ea6ae190baf489ba007f7c92608f33ce20ef04a
with:
repository: ${{ env.CHECKOUT_PATH }}
file_pattern: xml json
Expand Down
23 changes: 14 additions & 9 deletions .github/workflows/workflow-generate-website-reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@ jobs:
# 2) The target branch where the metaschemas exist that are the basis of reference information.
# Checkout the current branch for reading
- name: Checkout Latest
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
with:
path: ${{ env.BRANCH_PATH }}
submodules: recursive
fetch-depth: 0 # this ensures that the tag and commit history are available
# use this for builds triggered from the UI on protected branches
- name: Checkout Main (using COMMIT_TOKEN)
if: github.event_name == 'workflow_dispatch' && github.event.inputs.commit_resources == 'true'
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
with:
path: ${{ env.MAIN_PATH }}
ref: ${{ env.MAIN_BRANCH_REF }}
Expand All @@ -59,7 +59,7 @@ jobs:
# use this for builds triggered from other workflows on protected branches
- name: Checkout Main (using access_token)
if: github.event_name == 'push' && inputs.commit_resources == true
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
with:
path: ${{ env.MAIN_PATH }}
ref: ${{ env.MAIN_BRANCH_REF }}
Expand All @@ -69,7 +69,7 @@ jobs:
# use this for overything else (i.e., pull requests) where publication is not needed
- name: Checkout Main
if: steps.checkout_main_workflow.conclusion == 'skipped' && steps.checkout_main_push.conclusion == 'skipped'
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
with:
path: ${{ env.MAIN_PATH }}
ref: ${{ env.MAIN_BRANCH_REF }}
Expand All @@ -82,7 +82,7 @@ jobs:
# -------------------------
# Java JDK 11
- name: Set up JDK
uses: actions/setup-java@f0bb91606209742fe3ea40199be2f3ef195ecabf
uses: actions/setup-java@c3ac5dd0ed8db40fedb61c32fbe677e6b355e94c
with:
java-version: 11
distribution: 'temurin'
Expand All @@ -94,7 +94,7 @@ jobs:
mvn dependency:copy-dependencies -DoutputDirectory="${JAVA_CLASSPATH}"
# Install Hugo
- name: Store Hugo Executable in Cache
uses: actions/cache@0865c47f36e68161719c5b124609996bb5c40129
uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7
with:
path: /home/runner/go/bin/hugo
key: ${{ runner.os }}-hugo-${{ hashFiles(format('{0}/build/go.sum', env.BRANCH_PATH)) }}
Expand All @@ -105,7 +105,7 @@ jobs:
echo "/home/runner/go/bin" >> $GITHUB_PATH
- name: Setup Golang
if: steps.cache-hugo.outputs.cache-hit != 'true'
uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923
uses: actions/setup-go@d0a58c1c4d2b25278816e339b944508c875f3613
with:
go-version-file: '${{ env.BRANCH_PATH }}/build/go.mod'
cache: true
Expand All @@ -115,6 +115,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
Expand Down Expand Up @@ -144,7 +149,7 @@ jobs:
run: |
zip ${{ runner.temp }}/metaschema-website.zip -r public/
working-directory: ${{ env.MAIN_PATH }}/docs
- uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8
- uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb
with:
name: website
path: |
Expand All @@ -153,7 +158,7 @@ jobs:
- name: Publish Generated Pages
# only do this on master
if: github.event.inputs.commit_resources == 'true' || inputs.commit_resources == true
uses: stefanzweifel/git-auto-commit-action@be7095c202abcf573b09f20541e0ee2f6a3a9d9b
uses: stefanzweifel/git-auto-commit-action@3ea6ae190baf489ba007f7c92608f33ce20ef04a
with:
repository: ${{ env.MAIN_PATH }}
file_pattern: docs
Expand Down
35 changes: 20 additions & 15 deletions .github/workflows/workflow-generate-website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,23 +49,23 @@ jobs:
# use this for builds triggered from the UI on protected branches
- name: Checkout Latest (using COMMIT_TOKEN)
if: github.event_name == 'workflow_dispatch' && github.event.inputs.commit_resources == 'true'
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
with:
token: ${{ secrets.COMMIT_TOKEN }}
submodules: recursive
id: checkout_latest_workflow
# use this for builds triggered from other workflows on protected branches
- name: Checkout Latest (using access_token)
if: github.event_name == 'push' && inputs.commit_resources == true
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
with:
token: ${{ secrets.access_token }}
submodules: recursive
id: checkout_latest_push
# use this for overything else (i.e., pull requests) where publication is not needed
- name: Checkout Latest
if: steps.checkout_latest_workflow.conclusion == 'skipped' && steps.checkout_latest_push.conclusion == 'skipped'
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
with:
submodules: recursive
- name: Set env
Expand All @@ -76,7 +76,7 @@ jobs:
# -------------------------
# Java JDK 11
- name: Set up JDK
uses: actions/setup-java@f0bb91606209742fe3ea40199be2f3ef195ecabf
uses: actions/setup-java@c3ac5dd0ed8db40fedb61c32fbe677e6b355e94c
with:
java-version: 11
distribution: 'temurin'
Expand All @@ -86,20 +86,25 @@ jobs:
cd "${BUILD_PATH}"
mkdir -p "${JAVA_CLASSPATH}"
mvn dependency:copy-dependencies -DoutputDirectory="${JAVA_CLASSPATH}"
- 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 specification documentation
run: |
bash "${CICD_PATH}/generate-specification-documentation.sh"
- uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8
- uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb
with:
name: specification-docs
path: |
docs/content/concepts/processing/profile-resolution.html
retention-days: 5
# Install Hugo
- name: Store Hugo Executable in Cache
uses: actions/cache@0865c47f36e68161719c5b124609996bb5c40129
uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7
with:
path: /home/runner/go/bin/hugo
key: ${{ runner.os }}-hugo-${{ hashFiles(format('{0}/go.sum', env.BUILD_PATH)) }}
Expand All @@ -110,7 +115,7 @@ jobs:
echo "/home/runner/go/bin" >> $GITHUB_PATH
- name: Setup Golang
if: steps.cache-hugo.outputs.cache-hit != 'true'
uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923
uses: actions/setup-go@d0a58c1c4d2b25278816e339b944508c875f3613
with:
go-version-file: '${{ env.BUILD_PATH }}/go.mod'
cache: true
Expand All @@ -128,38 +133,38 @@ jobs:
run: |
zip ${{ runner.temp }}/metaschema-website.zip -r public/
working-directory: ${{ github.workspace }}/docs
- uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8
- uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb
with:
name: website
path: |
${{ runner.temp }}/metaschema-website.zip
retention-days: 5
- name: Link Checker
id: linkchecker
uses: lycheeverse/lychee-action@76ab977fedbeaeb32029313724a2e56a8a393548
uses: lycheeverse/lychee-action@4dcb8bee2a0a4531cba1a1f392c54e8375d6dd81
with:
args: --exclude-file ./build/config/.lycheeignore --verbose --no-progress './docs/public/**/*.html' --accept 200,206,429
args: --exclude-file ./build/config/.lycheeignore --verbose --no-progress --accept 200,206,429 './docs/public/**/*.html' --remap "https://pages.nist.gov/OSCAL/ file://${GITHUB_WORKSPACE}/docs/public/" --exclude-mail
format: markdown
output: html-link-report.md
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8
- uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb
with:
name: html-link-report
path: html-link-report.md
retention-days: 5
- uses: actions/github-script@7a5c598405937d486b0331594b5da2b14db670da
- uses: actions/github-script@d556feaca394842dc55e4734bf3bb9f685482fa0
if: steps.linkchecker.outputs.exit_code != 0
with:
script: |
core.setFailed('Link checker detected broken or invalid links, read attached report.')
- uses: actions/github-script@7a5c598405937d486b0331594b5da2b14db670da
- uses: actions/github-script@d556feaca394842dc55e4734bf3bb9f685482fa0
if: steps.linkchecker.outputs.exit_code != 0 && (github.event.inputs.bad_links_fail_build == 'true' || inputs.bad_links_fail_build == true)
with:
script: |
core.setFailed('Link checker detected broken or invalid links, read attached report.')
- name: Deploy Website (using access_token)
uses: peaceiris/actions-gh-pages@068dc23d9710f1ba62e86896f84735d869951305
uses: peaceiris/actions-gh-pages@de7ea6f8efb354206b205ef54722213d99067935
if: github.event_name == 'push' && inputs.commit_resources == true && github.ref_name == 'main'
with:
github_token: ${{ secrets.access_token }}
Expand All @@ -168,7 +173,7 @@ jobs:
publish_branch: nist-pages
commit_message: Deploying website [ci deploy skip]
- name: Deploy Website (using COMMIT_TOKEN)
uses: peaceiris/actions-gh-pages@068dc23d9710f1ba62e86896f84735d869951305
uses: peaceiris/actions-gh-pages@de7ea6f8efb354206b205ef54722213d99067935
if: github.event_name == 'workflow_dispatch' && github.event.inputs.commit_resources == 'true' && github.ref_name == 'main'
with:
github_token: ${{ secrets.COMMIT_TOKEN }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/workflow-validate-repo-markdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ jobs:
runs-on: ubuntu-20.04
steps:
# use this for pulls where checkout is anonymous
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
with:
submodules: recursive
# Setup runtime environment
# -------------------------
- name: Set up NodeJS
uses: actions/setup-node@1f8c6b94b26d0feae1e387ca63ccbdc44d27b561
uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516
with:
node-version-file: 'build/.nvmrc'
cache: 'npm'
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
id: linkchecker
- name: Create issue if bad links detected in repo
if: failure() && inputs.create_issue == true
uses: peter-evans/create-issue-from-file@97e6f902a416aac38834e23fa52e166aad0437d2 # v3.0.0
uses: peter-evans/create-issue-from-file@433e51abf769039ee20ba1293a088ca19d573b7f # v3.0.0
with:
title: Scheduled Check of Markdown Documents Found Bad Hyperlinks
content-filepath: mlc_report.log
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/workflow-validate-website-content.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,24 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout Latest
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
with:
fetch-depth: 0 # this ensures that the tag and commit history are available
- name: Checkout git ref of published website content
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
with:
ref: ${{ inputs.site_git_ref }}
path: ${{ inputs.site_git_ref_path }}
- name: Check website HTML content links
id: linkchecker
uses: lycheeverse/lychee-action@76ab977fedbeaeb32029313724a2e56a8a393548
uses: lycheeverse/lychee-action@4dcb8bee2a0a4531cba1a1f392c54e8375d6dd81
with:
args: --exclude-file ./build/config/.lycheeignore --verbose --no-progress --accept 200,206,429 './published/**/*.html' --exclude-mail
args: --exclude-file ./build/config/.lycheeignore --verbose --no-progress --accept 200,206,429 "./${INPUT_SITE_GIT_REF}/**/*.html" --remap "https://pages.nist.gov/OSCAL/ file://${GITHUB_WORKSPACE}/${INPUT_SITE_GIT_REF}/" --exclude-mail
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Create issue if bad links detected
if: steps.linkchecker.outputs.exit_code != 0 && inputs.create_issue
uses: peter-evans/create-issue-from-file@97e6f902a416aac38834e23fa52e166aad0437d2
uses: peter-evans/create-issue-from-file@433e51abf769039ee20ba1293a088ca19d573b7f
with:
title: Scheduled Check of Website Content Found Bad Hyperlinks
content-filepath: ./lychee/out.md
Expand Down
Loading