From 34777e70f0b7ed23fdb66fda34a94ce66132fa5d Mon Sep 17 00:00:00 2001 From: Al Date: Wed, 19 Jun 2024 18:52:40 -0400 Subject: [PATCH 1/4] Add running cmd without oscal-cli in shell after setup Ensure this works to consider tentative new work per comment in https://github.com/GSA/fedramp-automation/pull/601#pullrequestreview-2129108508. --- .github/workflows/test.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e240f98..9bf4fa3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,3 +29,11 @@ jobs: with: debug: true id: oscal_cli_basic_debug + - name: Run oscal-cli for version check (debugging on) + uses: ./ + id: oscal_cli_basic + - name: Run oscal-cli for version check (debugging off) + uses: ./ + run: | + date + id: alternate_shell_command From 711e5093784a00027263ad19b523e60e160d6757 Mon Sep 17 00:00:00 2001 From: Al Date: Wed, 19 Jun 2024 18:55:02 -0400 Subject: [PATCH 2/4] Woops, remove redundant step, remove incorrect usage of uses --- .github/workflows/test.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9bf4fa3..9853a1e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,11 +29,7 @@ jobs: with: debug: true id: oscal_cli_basic_debug - - name: Run oscal-cli for version check (debugging on) - uses: ./ - id: oscal_cli_basic - - name: Run oscal-cli for version check (debugging off) - uses: ./ + - name: Run another command that is not oscal-cli after setup run: | date id: alternate_shell_command From 2c006d68ed9832b37e71c45f7d61d30c821dd54d Mon Sep 17 00:00:00 2001 From: Al Date: Wed, 19 Jun 2024 21:20:21 -0400 Subject: [PATCH 3/4] Update README to explain running shell command after setup --- README.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index d55dce4..1b10be9 100644 --- a/README.md +++ b/README.md @@ -17,9 +17,12 @@ the code and setup a Java runtime as dependencies, or it will fail. distribution: adopt java-version: 11 id: setup_java -- name: Run oscal-cli for version check (debugging on) - uses: oscal-club/oscal-cli-action@v1.0.0 +- name: Validate SSP schema and constraints + uses: oscal-club/oscal-cli-action@v1.0.4 with: args: ssp validate repo/path/to/ssp.xml - id: convert_ssp -``` \ No newline at end of file + id: validate_ssp +- name: Run shell command with all setup and context from before + date + id: post_setup_shell_command +``` From 728d0669db3d9743c6d39b6d7a314c764401731a Mon Sep 17 00:00:00 2001 From: Al Date: Wed, 19 Jun 2024 21:21:47 -0400 Subject: [PATCH 4/4] Woops, got syntax in README post-setup shell example wrong --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1b10be9..53e574b 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ the code and setup a Java runtime as dependencies, or it will fail. args: ssp validate repo/path/to/ssp.xml id: validate_ssp - name: Run shell command with all setup and context from before - date + run: | + ls -lha id: post_setup_shell_command ```