diff --git a/.github/workflows/job-container-dev-release.yaml b/.github/workflows/job-container-dev-release.yaml index c9d0b38..bde8d07 100644 --- a/.github/workflows/job-container-dev-release.yaml +++ b/.github/workflows/job-container-dev-release.yaml @@ -333,21 +333,6 @@ jobs: dockerfile: ${{ inputs.dockerfile }} extra-build-args: ${{ inputs.extra-build-args }} - - name: test - shell: bash - run: | - pwd - ls -la - echo "try to cat ${{ inputs.image }}_${{ inputs.tag-annotation }}${{ inputs.tag }}_docker_build.log" - cat ${{ inputs.image }}_${{ inputs.tag-annotation }}${{ inputs.tag }}_docker_build.log - - # - name: upload build log as saved artifact - # uses: actions/upload-artifact@v4 - # with: - # name: ${{ inputs.image }}_${{ inputs.tag-annotation }}${{ inputs.tag }}_docker_build.log - # path: *_docker_build.log - # retention-days: 7 - - name: perform snyk cve scan if: ${{ inputs.snyk-scan == 'true' }} uses: ThoughtWorks-DPS/gha-tools-action/snyk-scan@main diff --git a/.github/workflows/publish-container.yaml b/.github/workflows/publish-container.yaml index 026795e..a717eeb 100644 --- a/.github/workflows/publish-container.yaml +++ b/.github/workflows/publish-container.yaml @@ -198,6 +198,11 @@ jobs: syft-version: ${{ inputs.syft-version }} oras-version: ${{ inputs.oras-version }} + - uses: actions/download-artifact@v4 + with: + name: ${{ inputs.image }}_${{ inputs.tag-annotation }}${{ inputs.version-tag }}_docker_build.log + path: ${{ inputs.image }}_${{ inputs.tag-annotation }}${{ inputs.version-tag }}_docker_build.log + - name: run custom before-publish action if: ${{ inputs.before-publish != 'false' }} uses: ./.github/actions/before-publish @@ -258,11 +263,6 @@ jobs: image: ${{ inputs.image }} tag: ${{ inputs.tag-annotation }}${{ inputs.release-tag }} - - uses: actions/download-artifact@v4 - with: - name: ${{ inputs.image }}_${{ inputs.tag-annotation }}${{ inputs.version-tag }}_docker_build.log - path: ${{ inputs.image }}_${{ inputs.tag-annotation }}${{ inputs.version-tag }}_docker_build.log - - name: run custom after-publish action if: ${{ inputs.after-publish != 'false' }} uses: ./.github/actions/after-publish diff --git a/snyk-scan/action.yaml b/snyk-scan/action.yaml index d2a7595..a74f8fb 100644 --- a/snyk-scan/action.yaml +++ b/snyk-scan/action.yaml @@ -81,7 +81,7 @@ runs: run: | #!/usr/bin/env bash set -eo pipefail - outfilename="${{ inputs.image }}_${{ inputs.tag }}_trivy_scan.log" + outfilename="${{ inputs.image }}_${{ inputs.tag }}_snyk_scan.log" echo "outfilename=$outfilename" >> $GITHUB_ENV