Skip to content

Commit 6ce388f

Browse files
authored
ci: use ubuntu-any-minus runners for zizmor and trufflehog (#199)
These scans are light enough for any small or medium runner, so pin them to at most the default size on either architecture instead of exactly arm64-small. The wider label reduces queueing when the arm64-small pool is short.
1 parent 0e5f80b commit 6ce388f

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

.github/workflows/org-required-trufflehog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ jobs:
2626
# Non-blocking: job succeeds; PR still gets comments/artifacts when findings exist
2727
fail-on-verified: "false" # Set "true" to fail on verified secrets
2828
fail-on-unverified: "false" # Set "true" to fail on unverified secrets
29-
runs-on: ${{ (!github.event.repository.private || github.repository_owner != 'grafana') && 'ubuntu-latest' || 'ubuntu-arm64-small' }} # grafana private repos use self-hosted ARM64; other orgs use ubuntu-latest
29+
runs-on: ${{ (!github.event.repository.private || github.repository_owner != 'grafana') && 'ubuntu-latest' || 'ubuntu-any-minus' }} # grafana private repos use self-hosted runners (any arch, medium or smaller); other orgs use ubuntu-latest
3030
secrets: inherit

.github/workflows/self-zizmor.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
name: Check whether there are things to scan
1616
permissions:
1717
contents: read
18-
runs-on: ${{ (!github.event.repository.private || github.repository_owner != 'grafana') && 'ubuntu-latest' || 'ubuntu-arm64-small' }} # grafana private repos use self-hosted ARM64; other orgs use ubuntu-latest
18+
runs-on: ${{ (!github.event.repository.private || github.repository_owner != 'grafana') && 'ubuntu-latest' || 'ubuntu-any-minus' }} # grafana private repos use self-hosted runners (any arch, medium or smaller); other orgs use ubuntu-latest
1919
outputs:
2020
found-files: ${{ steps.zizmor-check.outputs.found-files }}
2121
steps:
@@ -47,7 +47,7 @@ jobs:
4747

4848
uses: grafana/shared-workflows/.github/workflows/reusable-zizmor.yml@829aef098ea86ba0e61e74f895c00c9a8cc1fba9
4949
with:
50-
runs-on: ${{ (!github.event.repository.private || github.repository_owner != 'grafana') && 'ubuntu-latest' || 'ubuntu-arm64-small' }} # grafana private repos use self-hosted ARM64; other orgs use ubuntu-latest
50+
runs-on: ${{ (!github.event.repository.private || github.repository_owner != 'grafana') && 'ubuntu-latest' || 'ubuntu-any-minus' }} # grafana private repos use self-hosted runners (any arch, medium or smaller); other orgs use ubuntu-latest
5151
fail-severity: high
5252
min-severity: high
5353
min-confidence: low

0 commit comments

Comments
 (0)