Skip to content

Commit

Permalink
Merge branch 'usnistgov:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Rene2mt authored Aug 3, 2023
2 parents 0f55e5b + ef4df06 commit 060966e
Show file tree
Hide file tree
Showing 1,065 changed files with 23,324 additions and 6,898,679 deletions.
8 changes: 4 additions & 4 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# directory specific owners
/.github/ @usnistgov/itl-oscal-maintainers
/build/ @usnistgov/itl-oscal-maintainers
/content/ @david-waltermire-nist
/docs/ @david-waltermire-nist
/docs/content @david-waltermire-nist @iMichaela
/content/ @aj-stein-nist
/docs/ @aj-stein-nist
/docs/content @aj-stein-nist @iMichaela
/json/
/xml/
/src/ @usnistgov/itl-oscal-maintainers
/src/metaschema @david-waltermire-nist
/src/metaschema @aj-stein-nist
/src/specifications/profile-resolution @david-waltermire-nist @wendellpiez
/src/utils @wendellpiez
11 changes: 10 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,15 @@ body:
id: bug-comments
attributes:
label: Other comments
description: Add any other context about the problem here
description: |
Add any other context about the problem here
(For reviewers: [The wiki has guidance](https://github.com/usnistgov/OSCAL/wiki/Issue-Review) on code review and overall issue review for completeness.)
validations:
required: false
- type: textarea
id: revisions
attributes:
label: Revisions
description: If you are creating the issue, this field is not required. When working on the issue, this field is for assigned developers to flag any important changes made to the description, goals, or acceptance criteria needed to complete the work.

8 changes: 7 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ body:
- [ ] All [OSCAL website](https://pages.nist.gov/OSCAL) and readme documentation affected by the changes in this issue have been updated. Changes to the OSCAL website can be made in the docs/content directory of your branch.
- [ ] A Pull Request (PR) is submitted that fully addresses the goals of this User Story. This issue is referenced in the PR.
- [ ] The CI-CD build process runs without any reported errors on the PR. This can be confirmed by reviewing that all checks have passed in the PR.
(For reviewers: [The wiki has guidance](https://github.com/usnistgov/OSCAL/wiki/Issue-Review) on code review and overall issue review for completeness.)
validations:
required: true

- type: textarea
id: revisions
attributes:
label: Revisions
description: If you are creating the issue, this field is not required. When working on the issue, this field is for assigned developers to flag any important changes made to the description, goals, or acceptance criteria needed to complete the work.
5 changes: 3 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@
### All Submissions:

- [ ] Have you selected the correct base branch per [Contributing](https://github.com/usnistgov/OSCAL/blob/main/CONTRIBUTING.md) guidance?
- [ ] Have you set "[Allow edits and access to secrets by maintainers
](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork)"?
- [ ] Have you set "[Allow edits and access to secrets by maintainers](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork)"?
- [ ] Have you checked to ensure there aren't other open [Pull Requests](https://github.com/usnistgov/OSCAL/pulls) for the same update/change?
- [ ] Have you squashed any non-relevant commits and commit messages? \[[instructions](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History)\]
- [ ] Do all automated CI/CD checks pass?

By submitting a pull request, you are agreeing to provide this contribution under the [CC0 1.0 Universal public domain](https://creativecommons.org/publicdomain/zero/1.0/) dedication.

(For reviewers: [The wiki has guidance](https://github.com/usnistgov/OSCAL/wiki/Issue-Review) on code review and overall issue review for completeness.)

### Changes to Core Features:

- [ ] Have you added an explanation of what your changes do and why you'd like us to include them?
Expand Down
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@7ffb872c64bd809d23563a130a0a97d01dfa8f43
with:
project: Issue Triage
column: Done
Expand Down
62 changes: 0 additions & 62 deletions .github/workflows/link-check.yml

This file was deleted.

55 changes: 0 additions & 55 deletions .github/workflows/package-release.yml

This file was deleted.

32 changes: 32 additions & 0 deletions .github/workflows/periodic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Periodic Checks
on:
schedule:
- cron: "0 0 * * MON"
- cron: "0 0 * * THU"
workflow_dispatch:
jobs:
linkcheck:
name: Validate Markdown Links
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
with:
submodules: recursive
- uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c
with:
node-version-file: "build/.nvmrc"
cache: "npm"
cache-dependency-path: "build/package-lock.json"
- name: Perform link checking
run: |
make linkcheck
working-directory: build
- name: Create an issue if bad links are detected
if: failure()
uses: peter-evans/create-issue-from-file@433e51abf769039ee20ba1293a088ca19d573b7f # v3.0.0
with:
title: Scheduled Check of Markdown Documents Found Bad Hyperlinks
content-filepath: build/generated/mlc_report.log
labels: |
bug
Scope: Documentation
31 changes: 31 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Package Release
on:
push:
tags:
- v*
jobs:
package-release:
name: Package Release
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
with:
submodules: recursive
- uses: actions/setup-java@v3
with:
distribution: "temurin"
java-version: "17"
- name: Generate artifacts
# RELEASE is set to the tag name (vX.X.X) without the first character
run: |
make -j2 artifacts archives RELEASE=${GITHUB_REF_NAME:1}
working-directory: build
- name: Create release
uses: softprops/action-gh-release@v1
with:
token: ${{ secrets.COMMIT_TOKEN }}
draft: true
generate_release_notes: true
fail_on_unmatched_files: true
files: |
build/generated/oscal*
56 changes: 0 additions & 56 deletions .github/workflows/status-ci-cd.yml

This file was deleted.

38 changes: 38 additions & 0 deletions .github/workflows/status.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: OSCAL CI/CD
on:
push:
branches:
- main
- develop
- "feature-*"
- "release-*"
pull_request:
branches:
- main
- develop
- "feature-*"
- "release-*"
workflow_dispatch:
jobs:
checks:
name: Status Checks
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
with:
submodules: recursive
- uses: actions/setup-java@v3
with:
distribution: "temurin"
java-version: "17"
- uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c
with:
node-version-file: "build/.nvmrc"
cache: "npm"
cache-dependency-path: "build/package-lock.json"
- name: Install xmllint
run: sudo apt-get install -y libxml2-utils
- name: Run all pipelines
run: |
make --keep-going all
working-directory: build
Loading

0 comments on commit 060966e

Please sign in to comment.