Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ jobs:

- name: security/anchore-scan
id: anchore-operator
uses: mattermost/actions/delivery/anchore-scan@003fac68730de6e3e2dc31939e7f2c460f2a8ba0
uses: mattermost/actions/delivery/anchore-scan@354df0f666759a18085c7c7135db533f6b1da367
with:
image_name: mattermost/mattermost-operator:${{ github.ref_name }}
dockerfile_path: ./Dockerfile
Expand All @@ -115,7 +115,7 @@ jobs:

- name: security/anchore-scan-fips
id: anchore-operator-fips
uses: mattermost/actions/delivery/anchore-scan@003fac68730de6e3e2dc31939e7f2c460f2a8ba0
uses: mattermost/actions/delivery/anchore-scan@354df0f666759a18085c7c7135db533f6b1da367
with:
image_name: mattermost/mattermost-operator-fips:${{ github.ref_name }}
dockerfile_path: ./Dockerfile.fips
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ on:
- "v**"
pull_request:

concurrency:

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a sanity check: with the current configuration each new push to master cancels the previous in-progress ci run on refs/heads/master, because they share one concurrency group and cancel-in-progress: true. So, this can happens if we fast merge multiple pull-request which might affect some docker pushes that we do in CI. If this is accurate I wonder if we should just cancel in pull-request (e.g. cancel-in-progress: ${{ github.event_name == 'pull_request' }}).

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, addressing now.

group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.event_name == 'pull_request' }}

env:
ENABLE_FIPS_BUILDS: true # Set to false to disable FIPS builds

Expand Down
Loading