Skip to content
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.

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

fix(owl-bot): Reduce Risk of Git Conflicts When Updating PRs #2422

Merged
Merged
Changes from 2 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
19 changes: 19 additions & 0 deletions packages/owl-bot/cloud-build/update-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@ steps:
- 'Owl Bot'
env:
- 'HOME=/workspace'
- name: 'gcr.io/cloud-builders/git'
args:
- config
- --global
- pull.rebase
- 'false'
env:
- 'HOME=/workspace'
# Populate credentials for cloning:
- name: 'bash'
args:
Expand Down Expand Up @@ -87,6 +95,17 @@ steps:
dir: ${_REPOSITORY}
env:
- 'HOME=/workspace'
# Pull any recent changes to minimize risk of missing refs for the user.
# NOTE: This may not render owl-bot's desired state. Ensure owl-bot is ran after all relevant changes are captured.
- name: 'gcr.io/cloud-builders/git'
args:
- pull
- origin
- ${_PR_BRANCH}
dir: ${_REPOSITORY}
env:
- 'HOME=/workspace'
# Push updates:
- name: 'gcr.io/cloud-builders/git'
args:
- push
Expand Down