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.

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

Bot to pull changes from upstream #558

Closed
wants to merge 6 commits into from
Closed

Bot to pull changes from upstream #558

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4bfcd84
add WIP workflow
evan-forbes Oct 8, 2021
9075725
update to include 34 release branch
evan-forbes Oct 12, 2021
c45a7d1
spelling error
evan-forbes Oct 12, 2021
db31e47
fix branch name
evan-forbes Oct 12, 2021
981538d
formatting
evan-forbes Oct 12, 2021
c62270e
formatting
evan-forbes Oct 12, 2021
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
52 changes: 52 additions & 0 deletions .github/workflows/pull-changes-from-upstream.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: Pull from upstream

on:
workflow_dispatch:
schedule:
- cron: '0 8 * * 1,4'
jobs:
pull-from-upstream-master:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Reset the default branch with upstream changes
run: |
git remote add upstream https://github.com/tendermint/tendermint.git
git fetch upstream master:upstream-master
git reset --hard upstream-master
- name: Create Pull Request
uses: peter-evans/create-pull-request@v3
with:
token: ${{ secrets.PULL_UPSTREAM }}
commit-message: Upstream changes
title: Upstream changes from master
body: |
please review and fix any conflicts before merging
Auto-generated by [create-pull-request](https://github.com/peter-evans/create-pull-request)
branch: upstream-changes-master
base: master
delete-branch: true
reviewers: evan-forbes

pull-from-upstream-release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Reset the default branch with upstream changes
run: |
git remote add upstream https://github.com/tendermint/tendermint.git
git fetch upstream v0.34.x:upstream-release-v0.34.x
git reset --hard upstream-release-v0.34.x
- name: Create Pull Request
uses: peter-evans/create-pull-request@v3
with:
token: ${{ secrets.PULL_UPSTREAM }}
commit-message: Upstream changes
title: Upstream changes from the release branch
body: |
please review and fix any conflicts before merging
Auto-generated by [create-pull-request](https://github.com/peter-evans/create-pull-request)
branch: upstream-changes-release/v0.34.x
base: v0.34.x-celestia
delete-branch: true
reviewers: evan-forbes