Merge pull request #61 from fortify/release-please--branches--main--c…

…omponents--github-action chore(main): release 1.6.0
fortify · Nov 13, 2024 · 85bccd4 · 85bccd4
2 parents d9f0ec3 + 86d01f0
commit 85bccd4
Show file tree

Hide file tree

Showing 13 changed files with 48 additions and 36 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,18 @@
 
 # Changelog
 
+## [1.6.0](https://github.com/fortify/github-action/compare/v1.5.2...v1.6.0) (2024-11-13)
+
+
+### Features
+
+* Ability to override tool versions (resolves [#50](https://github.com/fortify/github-action/issues/50)) ([121db14](https://github.com/fortify/github-action/commit/121db14484d13d1b47f7e3e39a91d2f0c2830f40))
+
+
+### Bug Fixes
+
+* Documentation: Add `DO_WAIT` to applicable FoD sample snippets ([74febec](https://github.com/fortify/github-action/commit/74febec0828d596de142c879d9766d6cc9be69db))
+
 ## [1.5.2](https://github.com/fortify/github-action/compare/v1.5.1...v1.5.2) (2024-11-07)
 
 

diff --git 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.0
       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.0
       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.0
       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
@@ -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.0
+    - uses: fortify/github-action/setup@v1.6.0
       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.0
+    - uses: fortify/github-action/internal/run-script@v1.6.0
       with:
         script: export.sh
       env: 

diff --git 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.0
+    - uses: fortify/github-action/setup@v1.6.0
       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.0
+    - uses: fortify/github-action/package@v1.6.0
+    - uses: fortify/github-action/internal/run-script@v1.6.0
       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.0
 
 branding:
   icon: 'shield'

diff --git 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.0
       if: ${{ !env._FOD_LOGGED_IN }}
       with:
         script: fod-login.sh

diff --git 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.0
       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
@@ -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.0
       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
@@ -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.0
       if: ${{ !env._SSC_LOGGED_IN }}
       with:
         script: ssc-login.sh

diff --git 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.0
+    - uses: fortify/github-action/setup@v1.6.0
       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.0
       with:
         script: package.sh
 

diff --git 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.0
+    - uses: fortify/github-action/setup@v1.6.0
       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.0
+    - uses: fortify/github-action/internal/sc-sast-login@v1.6.0
+    - uses: fortify/github-action/package@v1.6.0
+    - uses: fortify/github-action/internal/run-script@v1.6.0
       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.0
 
 branding:
   icon: 'shield'

diff --git 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.0
+    - uses: fortify/github-action/setup@v1.6.0
       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.0
+    - uses: fortify/github-action/internal/run-script@v1.6.0
       with:
         script: sc-sast-and-debricked-scan.sh
       env: 

diff --git 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.0
+    - uses: fortify/github-action/setup@v1.6.0
       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.0
+    - uses: fortify/github-action/internal/run-script@v1.6.0
       with:
         script: export.sh
       env: 

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-1.5.2
+1.6.0