Skip to content

Integrate updates #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 24, 2023
Merged

Integrate updates #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa36e24
Fix bot name. Add Reflector as allowed buildomat user
augustuswm Apr 20, 2023
bd3ebdf
Re-enable listening to changes on main
augustuswm Apr 20, 2023
1bb0231
Adjust debounce
augustuswm Apr 20, 2023
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
1 change: 1 addition & 0 deletions .github/buildomat/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@ org_only = true
#
allow_users = [
"dependabot[bot]",
"oxide-reflector-bot[bot]",
"renovate[bot]",
]
14 changes: 14 additions & 0 deletions .github/reflector/integrate.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,15 @@ requires_token = true
# Listen for pushes to the nexus.json file in oxidecomputer/omicron and multiple source paths in
# oxidecomputer/progenitor (on each repository's respective default branch).

# Debounce values are used to batch together multiple pushes that occur in a relatively short
# timeframe

[[on]]
repository = "oxidecomputer/omicron"
paths = [
"openapi/nexus.json",
]
debounce = 60

[[on]]
repository = "oxidecomputer/progenitor"
Expand All @@ -28,3 +32,13 @@ paths = [
"Cargo.toml",
"Cargo.lock"
]
debounce = 300

# Listen for changes on the repo's own main branch. This ensures that the integration branch is
# always built on top of the latest code.
[[on]]
repository = "oxidecomputer/oxide.rs"
paths = [
"**",
]
debounce = 300
4 changes: 2 additions & 2 deletions .github/workflows/integrate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ jobs:

- name: Commit changes
run: |
git config --local user.name "reflector[bot]"
git config --local user.email "${{ inputs.reflector_user_id }}+reflector[bot]@users.noreply.github.com"
git config --local user.name "oxide-reflector-bot[bot]"
git config --local user.email "${{ inputs.reflector_user_id }}+oxide-reflector-bot[bot]@users.noreply.github.com"

# Detect specific changes that will be committed back
git diff --quiet cli/docs/cli.json || docsUpdate=$?
Expand Down