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
3 changes: 3 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,8 @@ updates:
groups:
actions:
patterns: ["*"]
actions-security:
applies-to: security-updates
patterns: ["*"]
cooldown:
default-days: 7
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Unreleased

- `templates/dependabot.yml`: security updates come as one grouped PR per ecosystem (`applies-to: security-updates`) instead of one PR per package. The version-update groups never applied to them.
- Caller templates: a new push to a pull request cancels that pull request's previous Status checks run (workflow-level `concurrency`). Push, schedule and merge-queue runs are never cancelled.
- Templates: no `codeql` job. Public repositories in the organization get CodeQL through default setup, which rejects results from `codeql.yml`.

## v1.1.3
Expand Down
10 changes: 7 additions & 3 deletions templates/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
# Copy to .github/dependabot.yml in every repository and delete the
# ecosystems you don't use. Updates are grouped (one PR per ecosystem) and
# wait 7 days after a release (cooldown) so compromised releases are usually
# yanked before they reach us. Security updates are not delayed.
# ecosystems you don't use. Updates are grouped (one PR per ecosystem, plus
# one for its security updates) and wait 7 days after a release (cooldown)
# so compromised releases are usually yanked before they reach us. Security
# updates are not delayed.
version: 2
updates:
- package-ecosystem: github-actions # also bumps the shared workflows
directory: /
schedule: { interval: weekly, day: monday }
groups:
actions: { patterns: ["*"] }
actions-security: { applies-to: security-updates, patterns: ["*"] }
cooldown: { default-days: 7 }

- package-ecosystem: docker # bumps tag AND @sha256 digest of FROM lines
Expand All @@ -23,6 +25,7 @@ updates:
schedule: { interval: weekly, day: monday }
groups:
go: { patterns: ["*"], update-types: [minor, patch] }
go-security: { applies-to: security-updates, patterns: ["*"] }
cooldown: { default-days: 7 }

- package-ecosystem: npm
Expand All @@ -31,6 +34,7 @@ updates:
groups:
npm-production: { dependency-type: production, update-types: [minor, patch] }
npm-development: { dependency-type: development, update-types: [minor, patch] }
npm-security: { applies-to: security-updates, patterns: ["*"] }
cooldown: { default-days: 7 }

- package-ecosystem: terraform
Expand Down
6 changes: 6 additions & 0 deletions templates/workflows/status-checks-go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ on:

permissions: {}

# A new push to a PR cancels the PR's previous run. Other events get a
# group of their own (run_id), so they never wait for or cancel each other.
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
cancel-in-progress: true

jobs:
go:
uses: privacybydesign/github-workflows/.github/workflows/go-checks.yml@v1
Expand Down
6 changes: 6 additions & 0 deletions templates/workflows/status-checks-node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ on:

permissions: {}

# A new push to a PR cancels the PR's previous run. Other events get a
# group of their own (run_id), so they never wait for or cancel each other.
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
cancel-in-progress: true

jobs:
node:
uses: privacybydesign/github-workflows/.github/workflows/node-checks.yml@v1
Expand Down
6 changes: 6 additions & 0 deletions templates/workflows/terraform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ on:

permissions: {}

# A new push to a PR cancels the PR's previous run. Other events get a
# group of their own (run_id), so they never wait for or cancel each other.
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
cancel-in-progress: true

jobs:
terraform:
strategy:
Expand Down
Loading