Skip to content

Commit

Permalink
Merge pull request #113 from voxpupuli/fix_broken_ci
Browse files Browse the repository at this point in the history
fix: revert to on-pull-request and disable cve scanning for the moment
  • Loading branch information
bastelfreak authored Aug 29, 2024
2 parents c07dc1b + cb3a8e8 commit ccd25ac
Showing 1 changed file with 30 additions and 28 deletions.
58 changes: 30 additions & 28 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
name: CI🚦

on:
pull_request_target:
pull_request:
branches:
- main
workflow_dispatch:

jobs:
Expand Down Expand Up @@ -49,36 +51,36 @@ jobs:
R10K_VERSION=${{ matrix.r10k_version }}
RUGGED_VERSION=${{ matrix.rugged_version }}
- name: Login to Docker Hub
uses: docker/login-action@v3
with:
username: voxpupulibot
password: ${{ secrets.DOCKERHUB_BOT_RO_PASSWORD }}
# - name: Login to Docker Hub
# uses: docker/login-action@v3
# with:
# username: voxpupulibot
# password: ${{ secrets.DOCKERHUB_BOT_RO_PASSWORD }}

- name: Analyze container image for CVEs
id: analyze-image-cves
uses: docker/scout-action@v1
with:
command: cves
image: 'local://ci/puppetserver:${{ matrix.version }}'
sarif-file: sarif.output.${{ matrix.version }}.${{ github.sha }}.json
write-comment: false
# - name: Analyze container image for CVEs
# id: analyze-image-cves
# uses: docker/scout-action@v1
# with:
# command: cves
# image: 'local://ci/puppetserver:${{ matrix.version }}'
# sarif-file: sarif.output.${{ matrix.version }}.${{ github.sha }}.json
# write-comment: false

- name: Compare container image to latest from Registry
id: compare-image
uses: docker/scout-action@v1
with:
command: compare
image: 'local://ci/puppetserver:${{ matrix.version }}'
to: 'ghcr.io/voxpupuli/puppetserver:${{ matrix.version }}-latest'
summary: true
keep-previous-comments: true
# - name: Compare container image to latest from Registry
# id: compare-image
# uses: docker/scout-action@v1
# with:
# command: compare
# image: 'local://ci/puppetserver:${{ matrix.version }}'
# to: 'ghcr.io/voxpupuli/puppetserver:${{ matrix.version }}-latest'
# summary: true
# keep-previous-comments: true

- name: Upload SARIF result
id: upload-sarif
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: sarif.output.${{ matrix.version }}.${{ github.sha }}.json
# - name: Upload SARIF result
# id: upload-sarif
# uses: github/codeql-action/upload-sarif@v3
# with:
# sarif_file: sarif.output.${{ matrix.version }}.${{ github.sha }}.json

tests:
needs:
Expand Down

0 comments on commit ccd25ac

Please sign in to comment.