From 33c03d7ff8c210369024933abddfa036045c3436 Mon Sep 17 00:00:00 2001 From: nicodes Date: Sun, 25 Oct 2026 05:34:03 +0100 Subject: [PATCH] ci: use standard public runners and avoid idle policy jobs --- .github/workflows/cd.yml | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/dependency-policy.yml | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 5a41439..6311385 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -15,7 +15,7 @@ concurrency: jobs: deploy: name: Deploy GitHub Pages - runs-on: blacksmith-2vcpu-ubuntu-2404 + runs-on: ubuntu-24.04 timeout-minutes: 10 permissions: contents: read diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 79b4c7d..247c4df 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ concurrency: jobs: check: name: "Test" - runs-on: blacksmith-2vcpu-ubuntu-2404 + runs-on: ubuntu-24.04 timeout-minutes: 10 steps: - name: "Check out source" diff --git a/.github/workflows/dependency-policy.yml b/.github/workflows/dependency-policy.yml index e6ab525..a82b431 100644 --- a/.github/workflows/dependency-policy.yml +++ b/.github/workflows/dependency-policy.yml @@ -19,7 +19,12 @@ concurrency: cancel-in-progress: false jobs: auto-merge: + if: >- + (github.event_name != 'workflow_run' && github.event_name != 'pull_request_target') || + (github.event_name == 'pull_request_target' && github.event.pull_request.user.login == 'dependabot[bot]' && github.event.pull_request.draft == false) || + (github.event_name == 'workflow_run' && github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success' && + (github.event.workflow_run.actor.login == 'dependabot[bot]' || startsWith(github.event.workflow_run.head_branch, 'dependabot/') || startsWith(github.event.workflow_run.head_branch, 'dependabot-'))) name: Apply dependency policy uses: nicodes/tools/.github/workflows/dependency-merge.yml@247267492cd455647facafcfcc6eed4c63c49c0e # v0.27.2 with: - runner: blacksmith-2vcpu-ubuntu-2404 + runner: ubuntu-24.04