Skip to content

Commit

Permalink
Undo CI workarounds
Browse files Browse the repository at this point in the history
Reactivate our container image scanning, set the pipeline timeout
back to 30 minutes, and re-enable fail-fast builds
  • Loading branch information
ian-noaa committed Sep 1, 2023
1 parent 37ff46b commit 2763d07
Showing 1 changed file with 13 additions and 14 deletions.
27 changes: 13 additions & 14 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ jobs:

build:
runs-on: ubuntu-latest
timeout-minutes: 120
timeout-minutes: 30
strategy:
# fail-fast: true # FIXME: Reactivate fail-fast once our image size is under control
fail-fast: true
matrix:
app:
- met-airquality
Expand Down Expand Up @@ -105,19 +105,18 @@ jobs:
--build-arg COMMITSHA=${{ github.sha }} \
-t ${{ env.DEV_REGISTRY }}/${{ env.APP_LOWERCASE }}:${{ env.BRANCH }} \
.
# FIXME: Reactivate image scanning once we've determined why the image size has blown up
# - name: Scan image with Trivy
# uses: aquasecurity/trivy-action@master
# with:
# image-ref: '${{ env.DEV_REGISTRY }}/${{ env.APP_LOWERCASE }}:${{ env.BRANCH }}'
# format: 'sarif'
# output: 'trivy-results-${{ env.APP_LOWERCASE }}.sarif'
# ignore-unfixed: true
- name: Scan image with Trivy
uses: aquasecurity/trivy-action@master
with:
image-ref: '${{ env.DEV_REGISTRY }}/${{ env.APP_LOWERCASE }}:${{ env.BRANCH }}'
format: 'sarif'
output: 'trivy-results-${{ env.APP_LOWERCASE }}.sarif'
ignore-unfixed: true

# - name: Upload Trivy scan results to GitHub Security tab
# uses: github/codeql-action/upload-sarif@v2
# with:
# sarif_file: 'trivy-results-${{ env.APP_LOWERCASE }}.sarif'
- name: Upload Trivy scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@v2
with:
sarif_file: 'trivy-results-${{ env.APP_LOWERCASE }}.sarif'

- name: Login to GitHub Container Registry
uses: docker/login-action@v1
Expand Down

0 comments on commit 2763d07

Please sign in to comment.