From 9955f81c84940c94f6182fbb886d420935bd6ef6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 13:15:41 +0000 Subject: [PATCH 1/2] chore(main): release 1.6.1 --- CHANGELOG.md | 10 ++++++++++ version.txt | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 765f237..bb7668f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,16 @@ # Changelog +## [1.6.1](https://github.com/fortify/github-action/compare/v1.6.0...v1.6.1) (2024-11-21) + + +### Bug Fixes + +* Configure static scan on `DO_SETUP` if needed ([9d54346](https://github.com/fortify/github-action/commit/9d543461f910f6408e354456d376e38cb219e1ab)) +* Improve FoD `SETUP_EXTRA_OPTS` documentation ([9d54346](https://github.com/fortify/github-action/commit/9d543461f910f6408e354456d376e38cb219e1ab)) +* Update Debricked CLI to 2.4.0 ([9d54346](https://github.com/fortify/github-action/commit/9d543461f910f6408e354456d376e38cb219e1ab)) +* Update fcli to 2.1.0 ([9d54346](https://github.com/fortify/github-action/commit/9d543461f910f6408e354456d376e38cb219e1ab)) + ## [1.6.0](https://github.com/fortify/github-action/compare/v1.5.2...v1.6.0) (2024-11-13) diff --git a/version.txt b/version.txt index dc1e644..9c6d629 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.6.0 +1.6.1 From 454d9c478d26414a22d18c64e8474cafabd43a2c Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 21 Nov 2024 13:15:44 +0000 Subject: [PATCH 2/2] chore: Update action references --- action.yml | 6 +++--- fod-export/action.yml | 8 ++++---- fod-sast-scan/action.yml | 12 ++++++------ internal/fod-login/action.yml | 2 +- internal/run-script/action.yml | 2 +- internal/sc-sast-login/action.yml | 2 +- internal/ssc-login/action.yml | 2 +- package/action.yml | 6 +++--- sc-sast-scan/action.yml | 14 +++++++------- ssc-debricked-scan/action.yml | 8 ++++---- ssc-export/action.yml | 8 ++++---- 11 files changed, 35 insertions(+), 35 deletions(-) diff --git a/action.yml b/action.yml index f99c9db..1c87c82 100644 --- a/action.yml +++ b/action.yml @@ -13,15 +13,15 @@ inputs: runs: using: composite steps: - - uses: fortify/github-action/fod-sast-scan@main + - uses: fortify/github-action/fod-sast-scan@v1.6.1 if: inputs['sast-scan']=='true' && env.FOD_URL env: DO_DEBRICKED_SCAN: ${{ inputs['debricked-sca-scan'] }} - - uses: fortify/github-action/sc-sast-scan@main + - uses: fortify/github-action/sc-sast-scan@v1.6.1 if: inputs['sast-scan']=='true' && env.SSC_URL env: DO_DEBRICKED_SCAN: ${{ inputs['debricked-sca-scan'] }} - - uses: fortify/github-action/ssc-debricked-scan@main + - uses: fortify/github-action/ssc-debricked-scan@v1.6.1 if: inputs['sast-scan']=='false' && inputs['debricked-sca-scan']=='true' && env.SSC_URL branding: diff --git a/fod-export/action.yml b/fod-export/action.yml index 53ab728..7143d5a 100644 --- a/fod-export/action.yml +++ b/fod-export/action.yml @@ -4,13 +4,13 @@ author: 'Fortify' runs: using: composite steps: - - uses: fortify/github-action/internal/set-fod-var-defaults@main - - uses: fortify/github-action/setup@main + - uses: fortify/github-action/internal/set-fod-var-defaults@v1.6.1 + - uses: fortify/github-action/setup@v1.6.1 with: export-path: false fcli: action-default - - uses: fortify/github-action/internal/fod-login@main - - uses: fortify/github-action/internal/run-script@main + - uses: fortify/github-action/internal/fod-login@v1.6.1 + - uses: fortify/github-action/internal/run-script@v1.6.1 with: script: export.sh env: diff --git a/fod-sast-scan/action.yml b/fod-sast-scan/action.yml index c423edf..839f63f 100644 --- a/fod-sast-scan/action.yml +++ b/fod-sast-scan/action.yml @@ -4,21 +4,21 @@ author: 'Fortify' runs: using: composite steps: - - uses: fortify/github-action/internal/set-fod-var-defaults@main - - uses: fortify/github-action/setup@main + - uses: fortify/github-action/internal/set-fod-var-defaults@v1.6.1 + - uses: fortify/github-action/setup@v1.6.1 with: export-path: false fcli: action-default - - uses: fortify/github-action/internal/fod-login@main - - uses: fortify/github-action/package@main - - uses: fortify/github-action/internal/run-script@main + - uses: fortify/github-action/internal/fod-login@v1.6.1 + - uses: fortify/github-action/package@v1.6.1 + - uses: fortify/github-action/internal/run-script@v1.6.1 with: script: fod-scan.sh env: DO_SAST_SCAN: true # Not used for now GITHUB_TOKEN: ${{ github.token }} - if: env.DO_EXPORT == 'true' - uses: fortify/github-action/fod-export@main + uses: fortify/github-action/fod-export@v1.6.1 branding: icon: 'shield' diff --git a/internal/fod-login/action.yml b/internal/fod-login/action.yml index e8071d9..1832863 100644 --- a/internal/fod-login/action.yml +++ b/internal/fod-login/action.yml @@ -7,7 +7,7 @@ runs: # If not run before: check preconditions, run fcli login command, and run # post-job fcli logout command. # Note that the calling action/workflow is responsible for installing fcli - - uses: fortify/github-action/internal/run-script@main + - uses: fortify/github-action/internal/run-script@v1.6.1 if: ${{ !env._FOD_LOGGED_IN }} with: script: fod-login.sh diff --git a/internal/run-script/action.yml b/internal/run-script/action.yml index f72d8f1..faa13dc 100644 --- a/internal/run-script/action.yml +++ b/internal/run-script/action.yml @@ -30,7 +30,7 @@ runs: - run: echo "TEMP_DIR=$(pwd)" >> $GITHUB_ENV shell: bash working-directory: ${{ runner.temp }} - - uses: fortify/github-action/internal/run-script/js@main + - uses: fortify/github-action/internal/run-script/js@v1.6.1 with: dir: ${{ env._RUN_SCRIPTS_DIR }} script: ${{ inputs.script }} diff --git a/internal/sc-sast-login/action.yml b/internal/sc-sast-login/action.yml index e62ee76..010adcb 100644 --- a/internal/sc-sast-login/action.yml +++ b/internal/sc-sast-login/action.yml @@ -11,7 +11,7 @@ runs: # If not run before: check preconditions, run fcli login command, and run # post-job fcli logout command. # Note that the calling action/workflow is responsible for installing fcli - - uses: fortify/github-action/internal/run-script@main + - uses: fortify/github-action/internal/run-script@v1.6.1 if: ${{ !env._SC_SAST_LOGGED_IN }} with: script: sc-sast-login.sh diff --git a/internal/ssc-login/action.yml b/internal/ssc-login/action.yml index 7bbe601..3d70371 100644 --- a/internal/ssc-login/action.yml +++ b/internal/ssc-login/action.yml @@ -7,7 +7,7 @@ runs: # If not run before: check preconditions, run fcli login command, and run # post-job fcli logout command. # Note that the calling action/workflow is responsible for installing fcli - - uses: fortify/github-action/internal/run-script@main + - uses: fortify/github-action/internal/run-script@v1.6.1 if: ${{ !env._SSC_LOGGED_IN }} with: script: ssc-login.sh diff --git a/package/action.yml b/package/action.yml index dbf9dc6..ada91c2 100644 --- a/package/action.yml +++ b/package/action.yml @@ -4,12 +4,12 @@ author: 'Fortify' runs: using: composite steps: - - uses: fortify/github-action/internal/setup-java-for-sc-client@main - - uses: fortify/github-action/setup@main + - uses: fortify/github-action/internal/setup-java-for-sc-client@v1.6.1 + - uses: fortify/github-action/setup@v1.6.1 with: export-path: false sc-client: action-default - - uses: fortify/github-action/internal/run-script@main + - uses: fortify/github-action/internal/run-script@v1.6.1 with: script: package.sh diff --git a/sc-sast-scan/action.yml b/sc-sast-scan/action.yml index 8445fb6..9d130be 100644 --- a/sc-sast-scan/action.yml +++ b/sc-sast-scan/action.yml @@ -4,23 +4,23 @@ author: 'Fortify' runs: using: composite steps: - - uses: fortify/github-action/internal/set-ssc-var-defaults@main - - uses: fortify/github-action/setup@main + - uses: fortify/github-action/internal/set-ssc-var-defaults@v1.6.1 + - uses: fortify/github-action/setup@v1.6.1 with: export-path: false fcli: action-default debricked-cli: ${{ env.DO_DEBRICKED_SCAN=='true' && 'action-default' || 'skip' }} - - uses: fortify/github-action/internal/ssc-login@main - - uses: fortify/github-action/internal/sc-sast-login@main - - uses: fortify/github-action/package@main - - uses: fortify/github-action/internal/run-script@main + - uses: fortify/github-action/internal/ssc-login@v1.6.1 + - uses: fortify/github-action/internal/sc-sast-login@v1.6.1 + - uses: fortify/github-action/package@v1.6.1 + - uses: fortify/github-action/internal/run-script@v1.6.1 with: script: sc-sast-and-debricked-scan.sh env: DO_SC_SAST_SCAN: true GITHUB_TOKEN: ${{ github.token }} - if: env.DO_EXPORT == 'true' - uses: fortify/github-action/ssc-export@main + uses: fortify/github-action/ssc-export@v1.6.1 branding: icon: 'shield' diff --git a/ssc-debricked-scan/action.yml b/ssc-debricked-scan/action.yml index 72ea583..972c21b 100644 --- a/ssc-debricked-scan/action.yml +++ b/ssc-debricked-scan/action.yml @@ -4,14 +4,14 @@ author: 'Fortify' runs: using: composite steps: - - uses: fortify/github-action/internal/set-ssc-var-defaults@main - - uses: fortify/github-action/setup@main + - uses: fortify/github-action/internal/set-ssc-var-defaults@v1.6.1 + - uses: fortify/github-action/setup@v1.6.1 with: export-path: false fcli: action-default debricked-cli: action-default - - uses: fortify/github-action/internal/ssc-login@main - - uses: fortify/github-action/internal/run-script@main + - uses: fortify/github-action/internal/ssc-login@v1.6.1 + - uses: fortify/github-action/internal/run-script@v1.6.1 with: script: sc-sast-and-debricked-scan.sh env: diff --git a/ssc-export/action.yml b/ssc-export/action.yml index 36061e2..3b2bc38 100644 --- a/ssc-export/action.yml +++ b/ssc-export/action.yml @@ -4,13 +4,13 @@ author: 'Fortify' runs: using: composite steps: - - uses: fortify/github-action/internal/set-ssc-var-defaults@main - - uses: fortify/github-action/setup@main + - uses: fortify/github-action/internal/set-ssc-var-defaults@v1.6.1 + - uses: fortify/github-action/setup@v1.6.1 with: export-path: false fcli: action-default - - uses: fortify/github-action/internal/ssc-login@main - - uses: fortify/github-action/internal/run-script@main + - uses: fortify/github-action/internal/ssc-login@v1.6.1 + - uses: fortify/github-action/internal/run-script@v1.6.1 with: script: export.sh env: