Skip to content

Commit f6a8d12

Browse files
authored
Integrate updates (#117)
* Fix bot name. Add Reflector as allowed buildomat user * Re-enable listening to changes on main * Adjust debounce
1 parent af866e6 commit f6a8d12

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

.github/buildomat/config.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@ org_only = true
1616
#
1717
allow_users = [
1818
"dependabot[bot]",
19+
"oxide-reflector-bot[bot]",
1920
"renovate[bot]",
2021
]

.github/reflector/integrate.toml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,15 @@ requires_token = true
1212
# Listen for pushes to the nexus.json file in oxidecomputer/omicron and multiple source paths in
1313
# oxidecomputer/progenitor (on each repository's respective default branch).
1414

15+
# Debounce values are used to batch together multiple pushes that occur in a relatively short
16+
# timeframe
17+
1518
[[on]]
1619
repository = "oxidecomputer/omicron"
1720
paths = [
1821
"openapi/nexus.json",
1922
]
23+
debounce = 60
2024

2125
[[on]]
2226
repository = "oxidecomputer/progenitor"
@@ -28,3 +32,13 @@ paths = [
2832
"Cargo.toml",
2933
"Cargo.lock"
3034
]
35+
debounce = 300
36+
37+
# Listen for changes on the repo's own main branch. This ensures that the integration branch is
38+
# always built on top of the latest code.
39+
[[on]]
40+
repository = "oxidecomputer/oxide.rs"
41+
paths = [
42+
"**",
43+
]
44+
debounce = 300

.github/workflows/integrate.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ jobs:
7777

7878
- name: Commit changes
7979
run: |
80-
git config --local user.name "reflector[bot]"
81-
git config --local user.email "${{ inputs.reflector_user_id }}+reflector[bot]@users.noreply.github.com"
80+
git config --local user.name "oxide-reflector-bot[bot]"
81+
git config --local user.email "${{ inputs.reflector_user_id }}+oxide-reflector-bot[bot]@users.noreply.github.com"
8282
8383
# Detect specific changes that will be committed back
8484
git diff --quiet cli/docs/cli.json || docsUpdate=$?

0 commit comments

Comments
 (0)