Skip to content

Commit

Permalink
remove duplicate param in baseline & fix version pinning for server
Browse files Browse the repository at this point in the history
Co-Authored-By: Rene Tshiteya <[email protected]>
  • Loading branch information
wandmagic and Rene2mt committed Feb 14, 2025
1 parent f4bba63 commit 02b2b52
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 11 deletions.
10 changes: 6 additions & 4 deletions src/content/module.mk
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# Variables
OSCAL_VERSION = $(shell jq -r .dependencies.oscal package.json)
OSCAL_CLI_VERSION = $(shell awk '/^oscal-cli/ {print $$2}' .tool-versions)
OSCAL_CLI = npx oscal@$(OSCAL_VERSION)
OSCAL_VERSION := $(shell node src/scripts/ci-get-version.js package oscal)
OSCAL_CLI_VERSION := $(shell node src/scripts/ci-get-version.js tool oscal-cli)
OSCAL_SERVER_VERSION := $(shell node src/scripts/ci-get-version.js tool oscal-server)
OSCAL_SERVER_PATH := $(shell node -e "console.log(process.cwd())")

SRC_DIR = ./src
DIST_DIR = ./dist
XML_DIR = $(DIST_DIR)/content/rev5/baselines/xml
Expand All @@ -18,7 +20,7 @@ YAML_FILES := $(shell find $(YAML_DIR) -type f -name "*.yaml" -o -name "*.yml" 2
init-content:
@npm install
$(OSCAL_CLI) use $(OSCAL_CLI_VERSION)
$(OSCAL_CLI) server update
$(OSCAL_CLI) server update -t $(OSCAL_SERVER_VERSION)
$(OSCAL_CLI) server start -bg
@(command -v xmllint >/dev/null 2>&1 || (command -v apt-get >/dev/null 2>&1 && sudo apt-get install -y libxml2-utils) || (command -v brew >/dev/null 2>&1 && brew install libxml2) || (command -v choco >/dev/null 2>&1 && choco install xsltproc) || echo "Please install xmllint manually")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1615,13 +1615,6 @@
</description>
</constraint>
</set-parameter>
<set-parameter param-id="mp-04_odp.01">
<constraint>
<description>
<p>all types of digital and non-digital media with sensitive information</p>
</description>
</constraint>
</set-parameter>
<set-parameter param-id="mp-04_odp.02">
<constraint>
<description>
Expand Down

0 comments on commit 02b2b52

Please sign in to comment.