diff --git a/.github/workflows/e2e-ci.yml b/.github/workflows/e2e-ci.yml index 14b71cddc..02b93ad7b 100644 --- a/.github/workflows/e2e-ci.yml +++ b/.github/workflows/e2e-ci.yml @@ -8,23 +8,27 @@ on: jobs: build: - runs-on: ubuntu-22.04 - + # runs-on: ubuntu-22.04 + strategy: + fail-fast: true + matrix: + platform: [ ubuntu-latest, macos-latest, windows-latest ] + runs-on: ${{ matrix.platform }} steps: - uses: actions/checkout@v4 - - name: Setup Node.js + - name: Setup Node.js ${{ matrix.platform }} uses: actions/setup-node@v4 with: node-version: "18" check-latest: true cache: 'npm' - - name: Install dependencies + - name: Install dependencies ${{ matrix.platform }} run: npm ci - - name: Prepack + - name: Prepack ${{ matrix.platform }} run: npm run prepack - - name: Run e2e tests + - name: Run e2e tests ${{ matrix.platform }} run: npm run test diff --git a/.gitignore b/.gitignore index c3b8450f6..0dbf494d0 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ out *.html saf-cli.log CliProcessOutput.log +deltaProcessReport.md diff --git a/README.md b/README.md index a948e35a3..ffe3bc0b4 100644 --- a/README.md +++ b/README.md @@ -1450,13 +1450,14 @@ See the wiki for more information on 👉 [Delta](https://github.com/mitre/saf/w Update an existing InSpec profile with updated XCCDF guidance USAGE - $ saf generate delta -J -X -o [-h] [-O ] [-r ] [-T rule|group|cis|version] [-L info|warn|debug|verbose] + $ saf generate delta [-L info|warn|debug|verbose] [-J | --interactive] [-X | ] [-o | ] + [-O | ] [-r | ] [-T rule|group|cis|version | ] [-M -c ] FLAGS -h, --help Show CLI help. - -J, --inspecJsonFile= (required) Input execution/profile JSON file - can be generated using the "inspec json | jq . > profile.json" command - -X, --xccdfXmlFile= (required) The XCCDF XML file containing the new guidance - in the form of .xml file - -o, --outputFolder= (required) The output folder for the updated profile - if not empty it will be overwritten + -J, --inspecJsonFile= (required if not --interactive) Input execution/profile JSON file - can be generated using the "inspec json | jq . > profile.json" command + -X, --xccdfXmlFile= (required if not --interactive) The XCCDF XML file containing the new guidance - in the form of .xml file + -o, --deltaOutputDir= (required if not --interactive) The output folder for the updated profile - if not empty it will be overwritten -O, --ovalXmlFile= The OVAL XML file containing definitions used in the new guidance - in the form of .xml file -T, --idType=