Skip to content

Commit

Permalink
Merging the released patch.
Browse files Browse the repository at this point in the history
  • Loading branch information
Michaela Iorga committed Nov 26, 2024
2 parents 4f02dac + 08206e5 commit b123c11
Show file tree
Hide file tree
Showing 33 changed files with 1,261 additions and 253 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ By submitting a pull request, you are agreeing to provide this contribution unde
- [ ] 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)?
- [ ] Have you updated all [OSCAL website](https://pages.nist.gov/OSCAL) and readme documentation affected by the changes you made? Changes to the OSCAL website can be made in the docs/content directory of your branch.
- [ ] Have you updated the [OSCAL website](https://pages.nist.gov/OSCAL) and readme documentation affected by the changes you made? Changes to the OSCAL website can be made in the [OSCAL-Pages](https://github.com/usnistgov/OSCAL-Pages) and [OSCAL_Reference](https://github.com/usnistgov/OSCAL-Reference) repositories.
2 changes: 1 addition & 1 deletion .github/workflows/issue-triage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
name: Add issue to project
runs-on: ubuntu-20.04
steps:
- uses: actions/add-to-project@31b3f3ccdc584546fc445612dec3f38ff5edb41c
- uses: actions/add-to-project@244f685bbc3b7adfa8466e08b698b5577571133e
with:
project-url: https://github.com/orgs/usnistgov/projects/25
github-token: ${{ secrets.COMMIT_TOKEN }}
4 changes: 2 additions & 2 deletions .github/workflows/periodic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
# Needed to post comments and issues
issues: write
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
with:
submodules: recursive
- uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65
- uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af
with:
node-version-file: "build/.nvmrc"
cache: "npm"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
name: Package Release
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
with:
submodules: recursive
- uses: actions/setup-java@v4
Expand All @@ -21,7 +21,7 @@ jobs:
make -j2 artifacts archives RELEASE=${GITHUB_REF_NAME:1}
working-directory: build
- name: Create release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
with:
token: ${{ secrets.COMMIT_TOKEN }}
draft: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/status.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ jobs:
name: Status Checks
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
with:
submodules: recursive
- uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: "17"
- uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65
- uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af
with:
node-version-file: "build/.nvmrc"
cache: "npm"
Expand Down
2 changes: 0 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ All requests for changes and enhancements to OSCAL are initiated through the pro
* [Defect Report](../../issues/new?template=bug_report.md&labels=bug): Use to report a problem with an existing OSCAL feature or capability.
* [Question](../../issues/new?labels=question&template=question.md): Use to ask a question about OSCAL.

Issue triage is managed by the core OSCAL project team using a [specialized project board](../../projects/52).

The core OSCAL project team regularly reviews open issues, prioritizes their handling, and updates the issue statuses and comments as needed.

## Communications mechanisms
Expand Down
2 changes: 1 addition & 1 deletion build/.nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v16
v20
2 changes: 1 addition & 1 deletion build/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ $(LINKCHECK_OUTPUT): node_modules $(LINKCHECK_CONFIG)
@mkdir -p $(GENERATED_DIR)
@echo Checking Markdown links...
cd ..; git ls-files -z "*.md" | \
xargs -0 npx --prefix build/ markdown-link-check -c build/$(LINKCHECK_CONFIG) | \
xargs -0n1 npx --prefix build/ markdown-link-check -c build/$(LINKCHECK_CONFIG) | \
tee build/$(LINKCHECK_OUTPUT); \
exit $${PIPESTATUS[1]}

Expand Down
5 changes: 4 additions & 1 deletion build/markdown-link-check.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
},
{
"pattern": "https://linux.die.net/man/1/xmllint/"
}
},
{
"pattern": "https://csrc.nist.gov/Projects/Open-Security-Controls-Assessment-Language"
}
],
"replacementPatterns": [
{
Expand Down
2 changes: 1 addition & 1 deletion build/metaschema-xslt
Submodule metaschema-xslt updated 132 files
Loading

0 comments on commit b123c11

Please sign in to comment.