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: 2 additions & 1 deletion .github/workflows/ci-rbe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ on:
required: false
default: false
type: boolean
workflow_call:

concurrency:
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.ref }}
Expand All @@ -24,7 +25,7 @@ permissions:
jobs:
test:
name: Test
if: github.event.repository.fork == false && startsWith(github.head_ref, 'renovate/') != true
if: github.event.repository.fork == false
uses: ./.github/workflows/bazel.yml
with:
name: All RBE tests
Expand Down
47 changes: 47 additions & 0 deletions .github/workflows/ci-renovate-rbe.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: CI - Renovate - RBE

on:
push:
branches:
- renovate/*

concurrency:
group: ci-renovate-rbe-${{ github.ref }}
cancel-in-progress: true

permissions:
contents: read

jobs:
pin:
name: Repin Dependencies
if: github.event.repository.fork == false
uses: ./.github/workflows/bazel.yml
with:
name: Repin Dependencies
run: |
./go all:pin
./go rust:pin
./go format
artifact-name: repin-changes

commit-repins:
name: Commit Repins
needs: pin
permissions:
contents: write
actions: read
uses: ./.github/workflows/commit-changes.yml
with:
artifact-name: repin-changes
commit-message: "Repin dependencies"

test:
name: Test
needs: commit-repins
uses: ./.github/workflows/ci-rbe.yml

ci-gh:
name: CI - GitHub
needs: commit-repins
uses: ./.github/workflows/ci.yml
102 changes: 0 additions & 102 deletions .github/workflows/renovate-dependencies.yml

This file was deleted.

106 changes: 0 additions & 106 deletions .github/workflows/renovate-dependency-pr.yml

This file was deleted.

24 changes: 3 additions & 21 deletions renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,11 @@
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["config:recommended"],
"dependencyDashboard": true,
"dependencyDashboardApproval": true,
"dependencyDashboardLabels": ["B-dependencies"],
"dependencyDashboardTitle": "Dependency Dashboard",
"dependencyDashboardHeader": "Renovate is configured to list discovered dependency updates here first. Do not approve dashboard items until the update scope has been reviewed.",
"automerge": false,
"dependencyDashboardHeader": "This dashboard exists for visibility into Renovate's state and for surfacing problems. Renovate creates branches automatically for eligible updates; each branch is pinned and tested by the CI - Renovate - RBE workflow. PRs are intentionally suppressed (prCreation: approval) — do not tick checkboxes under 'Pending Approval', as doing so would create a PR we don't want. For per-branch CI status, open the branch in GitHub and view its Actions runs.",
"prCreation": "approval",
"branchConcurrentLimit": 1,
"skipArtifactsUpdate": true,
"lockFileMaintenance": {
"enabled": false
},
"labels": ["B-dependencies"],
"baseBranchPatterns": ["trunk"],
"ignorePaths": [
Expand Down Expand Up @@ -145,20 +141,6 @@
"matchManagers": ["bazel-module"],
"matchPackageNames": ["rules_python"],
"allowedVersions": "<2"
},
{
"description": "Orchestrated workflow only: group major updates into the major-eval branch.",
"matchBaseBranches": ["temp/bazel-updates"],
"matchUpdateTypes": ["major"],
"groupName": "major dependency updates",
"groupSlug": "major-eval"
},
{
"description": "Orchestrated workflow only: group non-major updates into the minor-eval branch.",
"matchBaseBranches": ["temp/bazel-updates"],
"matchUpdateTypes": ["minor", "patch", "pin", "digest"],
"groupName": "minor dependency updates",
"groupSlug": "minor-eval"
}
]
}