use preview versions of oscal tools (#1072)

* fix constraints (#1070) * use preview versions of oscal tools * hotfix missing expect tag * Add the inter-boundary-component-has-information-type constraint (#1066) * Add the inter-boundary-component-has-information-type constraint * clean up ssp-inter-boundary-component-has-information-type-INVALID.xml * Hotfix styles (#1076) * style guide hotfix * Update fedramp-external-constraints.xml * use latest server build * Correct constraint message. (#1085) * add additional sample content (#1081) * Add new metapath target to 'security-level' constraint (#1079) * make build (#1080) * add inventory item constraints (#1063) * add inventory item constraints * update example file Co-Authored-By: A.J. Stein <alexander.stein@gsa.gov> * improve scan type constraint * massage constraints * improve constraint content * Update src/validations/constraints/fedramp-external-constraints.xml Co-authored-by: Gabeblis <gabriel.rodriguez@gsa.gov> * Update src/validations/constraints/fedramp-external-constraints.xml Co-authored-by: Gabeblis <gabriel.rodriguez@gsa.gov> * Update fedramp-external-constraints.xml * Update fedramp-external-constraints.xml * Squashed commit of the following: commit d7b0623 Author: wandmagic <156969148+wandmagic@users.noreply.github.com> Date: Tue Jan 7 14:47:44 2025 -0500 fix constraints (#1070) commit fc50a42 Author: wandmagic <156969148+wandmagic@users.noreply.github.com> Date: Fri Jan 3 14:21:47 2025 -0500 hotfix develop (#1064) * Squashed commit of the following: commit 18a02c9 Author: wandmagic <156969148+wandmagic@users.noreply.github.com> Date: Wed Jan 8 09:37:15 2025 -0500 Hotfix styles (#1076) * style guide hotfix * Update fedramp-external-constraints.xml commit 60b3c50 Author: DimitriZhurkin <dimitri.zhurkin@noblis.org> Date: Wed Jan 8 07:14:14 2025 -0700 Add the inter-boundary-component-has-information-type constraint (#1066) * Add the inter-boundary-component-has-information-type constraint * clean up ssp-inter-boundary-component-has-information-type-INVALID.xml commit d7b0623 Author: wandmagic <156969148+wandmagic@users.noreply.github.com> Date: Tue Jan 7 14:47:44 2025 -0500 fix constraints (#1070) commit fc50a42 Author: wandmagic <156969148+wandmagic@users.noreply.github.com> Date: Fri Jan 3 14:21:47 2025 -0500 hotfix develop (#1064) * Squashed commit of the following: commit 8c1a343 Author: Gabeblis <gabriel.rodriguez@gsa.gov> Date: Thu Jan 9 11:45:37 2025 -0500 Add new metapath target to 'security-level' constraint (#1079) commit 608080d Author: wandmagic <156969148+wandmagic@users.noreply.github.com> Date: Thu Jan 9 09:29:17 2025 -0500 add additional sample content (#1081) commit 1f55a73 Author: Gabeblis <gabriel.rodriguez@gsa.gov> Date: Thu Jan 9 09:22:28 2025 -0500 Correct constraint message. (#1085) commit 18a02c9 Author: wandmagic <156969148+wandmagic@users.noreply.github.com> Date: Wed Jan 8 09:37:15 2025 -0500 Hotfix styles (#1076) * style guide hotfix * Update fedramp-external-constraints.xml commit 60b3c50 Author: DimitriZhurkin <dimitri.zhurkin@noblis.org> Date: Wed Jan 8 07:14:14 2025 -0700 Add the inter-boundary-component-has-information-type constraint (#1066) * Add the inter-boundary-component-has-information-type constraint * clean up ssp-inter-boundary-component-has-information-type-INVALID.xml commit d7b0623 Author: wandmagic <156969148+wandmagic@users.noreply.github.com> Date: Tue Jan 7 14:47:44 2025 -0500 fix constraints (#1070) commit fc50a42 Author: wandmagic <156969148+wandmagic@users.noreply.github.com> Date: Fri Jan 3 14:21:47 2025 -0500 hotfix develop (#1064) --------- Co-authored-by: A.J. Stein <alexander.stein@gsa.gov> Co-authored-by: Gabeblis <gabriel.rodriguez@gsa.gov> * Add `inventory-item-has-software-version` constraint (#1039) * Add 'inventory-item-has-software-version' constraint and tests * Add 'inventory-item-has-software-version' constraint and tests * Add 'inventory-item-has-software-name' constraint and tests (#1038) * use preview versions of oscal tools * hotfix missing expect tag * use latest server build * fix order and missing expect closing tag * Update fedramp-external-constraints.xml * use versions matrix for snapshot testing This reverts commit 5679abd. * better action names * Update module.mk * Update .tool-versions --------- Co-authored-by: DimitriZhurkin <dimitri.zhurkin@noblis.org> Co-authored-by: Gabeblis <gabriel.rodriguez@gsa.gov> Co-authored-by: A.J. Stein <alexander.stein@gsa.gov>
GSA · Jan 13, 2025 · 26d8e2b · 26d8e2b
1 parent 719cf2c
commit 26d8e2b
Show file tree

Hide file tree

Showing 72 changed files with 718,745 additions and 1,051,166 deletions.
diff --git a/.github/workflows/run-lint.yml b/.github/workflows/run-lint.yml
@@ -17,7 +17,11 @@ jobs:
   # one job that runs tests
   run-tests:
     runs-on: ubuntu-20.04
-    # Checkout repository and its submodules
+    strategy:
+      matrix:
+        version: ['latest', 'snapshot']
+    name: Run style tests (${{ matrix.version }})
+        # Checkout repository and its submodules
     steps:
       # Check-out the repository under $GITHUB_WORKSPACE
       - name: Checkout repository
@@ -38,6 +42,8 @@ jobs:
         with:
           node-version: ${{ env.NODE_VERSION }}
       - name: Install OSCAL CLI 
+        env:
+          USE_SNAPSHOT: ${{ matrix.version == 'snapshot' && '1' || '' }}
         run: |
           make configure
       - name: Run Lint tests

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -8,6 +8,7 @@ on:
     branches:
       - master
       - develop
+      - canary
       - 'feature/**'  # This will match any branch starting with "feature"
 
   pull_request:
@@ -20,7 +21,9 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-20.04, windows-2022]
+        version: ['latest', 'snapshot']
     runs-on: ${{ matrix.os }}
+    name: Unit Tests (${{ matrix.os }}, ${{ matrix.version }})
     # Checkout repository and its submodules
     steps:
       # Check-out the repository under $GITHUB_WORKSPACE
@@ -42,6 +45,8 @@ jobs:
         with:
           node-version: ${{ steps.nvmrc.outputs.NODE_VERSION }}
       - name: Install OSCAL CLI
+        env:
+          USE_SNAPSHOT: ${{ matrix.version == 'snapshot' && '1' || '' }}
         run: |
           make init-validations
       - name: Run Cucumber tests

diff --git a/.tool-versions b/.tool-versions
@@ -1,2 +1,4 @@
 oscal-cli 2.4.0
-oscal-server v1.0.0-SNAPSHOT-6363f60-20241202160440
+oscal-cli-snapshot 2.5.0-SNAPSHOT
+oscal-server v1.0.0-SNAPSHOT-6363f60-20241202160440
+oscal-server-snapshot v1.0.0-SNAPSHOT-6773e8b-20250108155951