Skip to content

Commit

Permalink
Merge pull request #65 from fortify/release-please--branches--main--c…
Browse files Browse the repository at this point in the history
…omponents--github-action

chore(main): release 1.6.3
  • Loading branch information
rsenden authored Dec 11, 2024
2 parents a804808 + b73e29a commit b1ae72d
Show file tree
Hide file tree
Showing 13 changed files with 43 additions and 36 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@

# Changelog

## [1.6.3](https://github.com/fortify/github-action/compare/v1.6.2...v1.6.3) (2024-12-11)


### Bug Fixes

* `DO_PR_COMMENT`: Use `GITHUB_API_URL` environment variable instead of hardcoded api.github.com to avoid failure on GitHub Enterprise ([a804808](https://github.com/fortify/github-action/commit/a804808adae91155d7a6d272fc0fc727d99c715f))

## [1.6.2](https://github.com/fortify/github-action/compare/v1.6.1...v1.6.2) (2024-11-21)


Expand Down
6 changes: 3 additions & 3 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.3
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.3
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.3
if: inputs['sast-scan']=='false' && inputs['debricked-sca-scan']=='true' && env.SSC_URL

branding:
Expand Down
8 changes: 4 additions & 4 deletions fod-export/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.3
- uses: fortify/github-action/setup@v1.6.3
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.3
- uses: fortify/github-action/internal/run-script@v1.6.3
with:
script: export.sh
env:
Expand Down
12 changes: 6 additions & 6 deletions fod-sast-scan/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.3
- uses: fortify/github-action/setup@v1.6.3
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.3
- uses: fortify/github-action/package@v1.6.3
- uses: fortify/github-action/internal/run-script@v1.6.3
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.3

branding:
icon: 'shield'
Expand Down
2 changes: 1 addition & 1 deletion internal/fod-login/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.3
if: ${{ !env._FOD_LOGGED_IN }}
with:
script: fod-login.sh
Expand Down
2 changes: 1 addition & 1 deletion internal/run-script/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.3
with:
dir: ${{ env._RUN_SCRIPTS_DIR }}
script: ${{ inputs.script }}
Expand Down
2 changes: 1 addition & 1 deletion internal/sc-sast-login/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.3
if: ${{ !env._SC_SAST_LOGGED_IN }}
with:
script: sc-sast-login.sh
Expand Down
2 changes: 1 addition & 1 deletion internal/ssc-login/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.3
if: ${{ !env._SSC_LOGGED_IN }}
with:
script: ssc-login.sh
Expand Down
6 changes: 3 additions & 3 deletions package/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.3
- uses: fortify/github-action/setup@v1.6.3
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.3
with:
script: package.sh

Expand Down
14 changes: 7 additions & 7 deletions sc-sast-scan/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.3
- uses: fortify/github-action/setup@v1.6.3
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.3
- uses: fortify/github-action/internal/sc-sast-login@v1.6.3
- uses: fortify/github-action/package@v1.6.3
- uses: fortify/github-action/internal/run-script@v1.6.3
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.3

branding:
icon: 'shield'
Expand Down
8 changes: 4 additions & 4 deletions ssc-debricked-scan/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.3
- uses: fortify/github-action/setup@v1.6.3
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.3
- uses: fortify/github-action/internal/run-script@v1.6.3
with:
script: sc-sast-and-debricked-scan.sh
env:
Expand Down
8 changes: 4 additions & 4 deletions ssc-export/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.3
- uses: fortify/github-action/setup@v1.6.3
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.3
- uses: fortify/github-action/internal/run-script@v1.6.3
with:
script: export.sh
env:
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.6.2
1.6.3

0 comments on commit b1ae72d

Please sign in to comment.