Merge branch 'develop' into SYNPY-1781

Author: Lingling Peng

.github/workflows/docker_build.yml

@@ -65,6 +65,7 @@ jobs:
       IMAGE_NAME: rebuild-image:local
       TARFILE_NAME: ${{ needs.build.outputs.tarfile_artifact }}
       EXIT_CODE: 1
+      ARTIFACT_NAME_SUFFIX: -rebuild
     permissions:
       contents: read
       security-events: write

.github/workflows/trivy.yml

@@ -24,6 +24,10 @@ on:
         required: false
         type: number
         default: 0
+      ARTIFACT_NAME_SUFFIX: # optional suffix to disambiguate artifact names when this workflow is called multiple times in the same run
+        required: false
+        type: string
+        default: ""
     outputs:
       trivy_conclusion:
         description: "The pass/fail status from Trivy"
@@ -84,7 +88,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ !cancelled() }}
         with:
-          name: ${{ env.sarif_file_name }}
+          name: ${{ env.sarif_file_name }}${{ inputs.ARTIFACT_NAME_SUFFIX }}
           path: ${{ env.sarif_file_name }}
 
     outputs: