diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index d737634d6..f30d0c9df 100644 --- 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: diff --git a/.tool-versions b/.tool-versions index c1bdf69c1..d9e53ac3a 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,2 +1,2 @@ -oscal-cli 2.4.0 +oscal-cli 2.5.0-SNAPSHOT oscal-server v1.0.0-SNAPSHOT-6363f60-20241202160440 \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 60f071366..52cd7fb48 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "inquirer": "^10.1.8", "js-yaml": "^4.1.0", "jsdom": "^25.0.0", - "oscal": "2.0.7", + "oscal": "2.0.8-rc5", "ts-node": "^10.9.2", "xml-formatter": "^3.6.3", "xml2js": "^0.6.2" @@ -2694,9 +2694,9 @@ } }, "node_modules/oscal": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/oscal/-/oscal-2.0.7.tgz", - "integrity": "sha512-V924hmb+QZDuBJGLH63RZui7yzrpVvSQAq9TvWCt2XacrpXqiYwEst0ZyyWza9wrt4zEXJrhAP3wzz1oj38pHA==", + "version": "2.0.8-rc5", + "resolved": "https://registry.npmjs.org/oscal/-/oscal-2.0.8-rc5.tgz", + "integrity": "sha512-GaexZyBAx/wLDNW9jcfGjnjUGE7fRH3Ci9gbagLuzPyZTn511Co1b4uTIsG8O8X6mWPk/+gx6DG2DEQCcj9SVA==", "license": "MIT", "dependencies": { "@terascope/fetch-github-release": "^0.8.10", diff --git a/package.json b/package.json index c78d588e4..7434a4463 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "inquirer": "^10.1.8", "js-yaml": "^4.1.0", "jsdom": "^25.0.0", - "oscal": "2.0.7", + "oscal": "2.0.8-rc5", "ts-node": "^10.9.2", "xml-formatter": "^3.6.3", "xml2js": "^0.6.2"