diff --git a/CHANGELOG.md b/CHANGELOG.md index 6321d13..03bb117 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,13 @@ # Changelog +## [2.1.1](https://github.com/fortify/github-action/compare/v2.1.0...v2.1.1) (2025-06-14) + + +### Bug Fixes + +* Fix potential source file path inconsistencies in SAST security report (see https://github.com/fortify/fcli/issues/749) ([cc61a88](https://github.com/fortify/github-action/commit/cc61a887416d048428bb8a2ae6b157c2da83f36f)) + ## [2.1.0](https://github.com/fortify/github-action/compare/v2.0.0...v2.1.0) (2025-06-14) diff --git a/action.yml b/action.yml index f99c9db..e724934 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@v2.1.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@v2.1.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@v2.1.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 7943b10..3dce609 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@v2.1.1 + - uses: fortify/github-action/setup@v2.1.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@v2.1.1 + - uses: fortify/github-action/internal/run-script@v2.1.1 with: script: export.sh env: diff --git a/fod-sast-scan/action.yml b/fod-sast-scan/action.yml index c423edf..eb6090e 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@v2.1.1 + - uses: fortify/github-action/setup@v2.1.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@v2.1.1 + - uses: fortify/github-action/package@v2.1.1 + - uses: fortify/github-action/internal/run-script@v2.1.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@v2.1.1 branding: icon: 'shield' diff --git a/internal/fod-login/action.yml b/internal/fod-login/action.yml index e8071d9..ba4a36d 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@v2.1.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..fee49ef 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@v2.1.1 with: dir: ${{ env._RUN_SCRIPTS_DIR }} script: ${{ inputs.script }} diff --git a/internal/ssc-login/action.yml b/internal/ssc-login/action.yml index 7bbe601..e67741a 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@v2.1.1 if: ${{ !env._SSC_LOGGED_IN }} with: script: ssc-login.sh diff --git a/package/action.yml b/package/action.yml index a8103c9..b9b6dae 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@v2.1.1 + - uses: fortify/github-action/setup@v2.1.1 with: export-path: false sc-client: action-default - - uses: fortify/github-action/internal/run-script@main + - uses: fortify/github-action/internal/run-script@v2.1.1 with: script: package.sh - name: Store ScanCentral package diff --git a/sc-sast-scan/action.yml b/sc-sast-scan/action.yml index c1a8d3f..17199c3 100644 --- a/sc-sast-scan/action.yml +++ b/sc-sast-scan/action.yml @@ -4,22 +4,22 @@ 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@v2.1.1 + - uses: fortify/github-action/setup@v2.1.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/package@main - - uses: fortify/github-action/internal/run-script@main + - uses: fortify/github-action/internal/ssc-login@v2.1.1 + - uses: fortify/github-action/package@v2.1.1 + - uses: fortify/github-action/internal/run-script@v2.1.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@v2.1.1 branding: icon: 'shield' diff --git a/ssc-debricked-scan/action.yml b/ssc-debricked-scan/action.yml index 72ea583..f8d78e9 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@v2.1.1 + - uses: fortify/github-action/setup@v2.1.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@v2.1.1 + - uses: fortify/github-action/internal/run-script@v2.1.1 with: script: sc-sast-and-debricked-scan.sh env: diff --git a/ssc-export/action.yml b/ssc-export/action.yml index 862cc5d..d61dcb1 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@v2.1.1 + - uses: fortify/github-action/setup@v2.1.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@v2.1.1 + - uses: fortify/github-action/internal/run-script@v2.1.1 with: script: export.sh env: diff --git a/version.txt b/version.txt index 7ec1d6d..3e3c2f1 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.1.0 +2.1.1