diff --git a/.github/workflows/renovate.yaml b/.github/workflows/renovate.yaml index e1282680e5..789b4f5865 100644 --- a/.github/workflows/renovate.yaml +++ b/.github/workflows/renovate.yaml @@ -23,10 +23,6 @@ on: description: Log Level default: debug required: false - version: - description: Renovate version - default: latest - required: false concurrency: group: ${{ github.workflow }}-${{ github.event.number || github.ref }} @@ -38,7 +34,14 @@ permissions: jobs: main: name: Renovate - runs-on: ubuntu-latest + # In-cluster, UNPRIVILEGED ARC runner set (no Talos mount, namespaced RBAC + # only). `container:` makes kube-mode run the steps in a separate job pod; + # the runner set's hook template runs it as the runner uid with no + # ServiceAccount token. See + # kubernetes/apps/actions-runner-system/actions-runner-controller/runners/dapper-cluster-unprivileged/ + runs-on: dapper-cluster-unprivileged + container: + image: ghcr.io/renovatebot/renovate:44.216.1@sha256:5b22aef2bf23e861a9eea10db05392122f49aa43ec298d3a5ea207cf374d08ec permissions: contents: read packages: read @@ -57,22 +60,22 @@ jobs: permission-statuses: write permission-workflows: write - - name: Checkout - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - with: - persist-credentials: false - token: "${{ steps.app-token.outputs.token }}" - + # No checkout: Renovate clones the repo itself. The image is pinned by + # digest (Renovate bumps it) instead of the old `renovate-version: latest`. - name: Run Renovate - uses: renovatebot/github-action@1c0cf989c02653fba0efe7ca5772338860ca71dc # v46.3.12 env: LOG_LEVEL: "${{ inputs.logLevel || 'debug' }}" RENOVATE_AUTODISCOVER: true RENOVATE_AUTODISCOVER_FILTER: "${{ github.repository }}" + # Persistent /cache volume (runner-set hook template): keep the clone, + # repository cache, package cache and downloaded tools between runs so + # only deltas cross the WAN. Cold runs were ~2.5x slower than GitHub. + RENOVATE_BASE_DIR: /cache/renovate + RENOVATE_PERSIST_REPO_DATA: true + RENOVATE_REPOSITORY_CACHE: enabled RENOVATE_DRY_RUN: "${{ inputs.dryRun }}" RENOVATE_INTERNAL_CHECKS_FILTER: strict RENOVATE_PLATFORM: github RENOVATE_PLATFORM_COMMIT: true - with: - token: "${{ steps.app-token.outputs.token }}" - renovate-version: "${{ inputs.version || 'latest' }}" + RENOVATE_TOKEN: "${{ steps.app-token.outputs.token }}" + run: renovate diff --git a/.renovate/autoMerge.json5 b/.renovate/autoMerge.json5 index 853bc47599..269d97c9f9 100644 --- a/.renovate/autoMerge.json5 +++ b/.renovate/autoMerge.json5 @@ -109,7 +109,6 @@ // Database "/cloudnative-pg/", "/dragonfly/", - "/emqx/", ], minimumReleaseAge: "12 hours", ignoreTests: false, @@ -251,6 +250,14 @@ matchPackageNames: ["/dapperdivers/"], automerge: false, }, + { + description: "Disable automerge for EMQX (broker + operator)", + // The emqx-operator can't roll even patch bumps: 6.2.3 wedged the broker + // for 8 days (rolled back in #4070; #4072 closed). EMQX carries all + // Zigbee/HA control traffic, so every bump is a watched, manual merge. + matchPackageNames: ["/emqx/"], + automerge: false, + }, { description: "Disable automerge for the CNPG Postgres image", // A bump rolls every instance of the shared database cluster (switchover