Skip to content

Commit 6e3a8b3

Browse files
committed
Test Renovate branches directly
- Permit tests to run on branches matching renovate/*, configured the same as PR tests. This permits Renovate to pre-test branches, and when we're comfortable will permit automatic merging if desired. - Tell renovate where our actions templates are stored.
1 parent 3fddd25 commit 6e3a8b3

14 files changed

+50
-34
lines changed

.github/renovate.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,10 @@
1111
},
1212
"prCreation": "not-pending",
1313
"rangeStrategy": "replace",
14-
"stabilityDays": 3
14+
"stabilityDays": 3,
15+
"github-actions": {
16+
"fileMatch": [
17+
"^ci\\/.*/[^/]+\\.ya?ml$"
18+
]
19+
}
1520
}

.github/workflows/centos-fmt-clippy-on-all.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111
branches:
1212
- master
1313
- stable
14+
- renovate/*
1415
schedule:
1516
- cron: "30 0 * * 1" # Every Monday at half past midnight
1617

.github/workflows/linux-builds-on-master.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
name: Linux (master) # skip-pr skip-stable
55

66
on:
7-
push: # skip-pr
8-
branches: # skip-pr
9-
- master # skip-pr skip-stable
7+
push: # skip-pr
8+
branches: # skip-pr
9+
- master # skip-pr skip-stable
1010
schedule: # skip-pr skip-stable
1111
- cron: "30 0 * * 1" # Every Monday at half past midnight UTC skip-pr skip-stable
1212

.github/workflows/linux-builds-on-pr.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
name: Linux (PR) # skip-master skip-stable
55

66
on:
7-
pull_request: # skip-master skip-stable
8-
branches: # skip-master skip-stable
9-
- "*" # skip-master skip-stable
7+
pull_request: # skip-master skip-stable
8+
branches: # skip-master skip-stable
9+
- "*" # skip-master skip-stable
10+
- renovate/* # skip-master skip-stable
1011

1112
jobs:
1213
build:

.github/workflows/linux-builds-on-stable.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
name: Linux (stable) # skip-master skip-pr
55

66
on:
7-
push: # skip-pr
8-
branches: # skip-pr
9-
- stable # skip-pr skip-master
7+
push: # skip-pr
8+
branches: # skip-pr
9+
- stable # skip-pr skip-master
1010

1111
jobs:
1212
build:

.github/workflows/macos-builds-on-all.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
branches:
1111
- master
1212
- stable
13+
- renovate/*
1314
schedule:
1415
- cron: "30 0 * * 1" # Every Monday at half past midnight UTC
1516

.github/workflows/windows-builds-on-master.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
name: Windows (master) # skip-pr skip-stable
55

66
on:
7-
push: # skip-pr
8-
branches: # skip-pr
9-
- master # skip-pr skip-stable
7+
push: # skip-pr
8+
branches: # skip-pr
9+
- master # skip-pr skip-stable
1010
schedule: # skip-pr skip-stable
1111
- cron: "30 0 * * 1" # Every Monday at half past midnight UTC skip-pr skip-stable
1212

.github/workflows/windows-builds-on-pr.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
name: Windows (PR) # skip-master skip-stable
55

66
on:
7-
pull_request: # skip-master skip-stable
8-
branches: # skip-master skip-stable
9-
- "*" # skip-master skip-stable
7+
pull_request: # skip-master skip-stable
8+
branches: # skip-master skip-stable
9+
- "*" # skip-master skip-stable
10+
- renovate/* # skip-master skip-stable
1011

1112
jobs:
1213
build:

.github/workflows/windows-builds-on-stable.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
name: Windows (stable) # skip-master skip-pr
55

66
on:
7-
push: # skip-pr
8-
branches: # skip-pr
9-
- stable # skip-pr skip-master
7+
push: # skip-pr
8+
branches: # skip-pr
9+
- stable # skip-pr skip-master
1010

1111
jobs:
1212
build:

ci/actions-templates/README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,15 @@ This directory contains all the workflows we use in Rustup for GitHub Actions.
44

55
## Triggers for CI builds
66

7-
Rustup has four situations in which we perform CI builds:
7+
Rustup has five situations in which we perform CI builds:
88

99
1. On PR changes
1010
2. On merge to master
1111
3. Time-based rebuilds of master
1212
4. Pushes to the stable branch
13+
5. Renovate branches with dependency updates, tested before opening a PR or
14+
merging. They are assessed the same as a PR: if it would be good enough as a
15+
human proposed change, its good enough as a robot proposed change.
1316

1417
The goals for each of those situations are subtly different. For PR changes,
1518
we want to know as quickly as possible if the change is likely to be an issue.

0 commit comments

Comments
 (0)