diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml index d078c279..b951d395 100644 --- a/.github/workflows/ci-pr.yml +++ b/.github/workflows/ci-pr.yml @@ -7,7 +7,6 @@ env: MAIN_PATH: 'build-dir' GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} MAVEN_THREADS: 'true' - TRIVY_DEBUG: 'true' jobs: build: if: github.repository == 'spring-cloud/stream-applications' @@ -147,8 +146,7 @@ jobs: ignore-unfixed: true format: 'table' severity: 'CRITICAL,HIGH' - timeout: '2h' - skip-files: '**/README.adoc' + timeout: '15m' - name: 'Scanned' shell: bash run: echo "::info ::Scanned" diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml index c9324daf..9cea7006 100644 --- a/.github/workflows/common.yml +++ b/.github/workflows/common.yml @@ -35,7 +35,6 @@ env: VERBOSE: ${{ (github.debug || inputs.verbose) && 'true' || '' }} BRANCH: ${{ inputs.branch }} MAVEN_THREADS: ${{ inputs.mavenThreads }} - TRIVY_DEBUG: 'true' jobs: scan: @@ -51,8 +50,7 @@ jobs: format: 'sarif' output: 'trivy-results.sarif' severity: 'CRITICAL,HIGH' - timeout: '2h' - skip-files: '**/README.adoc' + timeout: '15m' - name: Upload Trivy scan results to GitHub Security tab uses: github/codeql-action/upload-sarif@v2 with: