From 4bfcd842c316955bb80079cacf1eae5b2ba99a35 Mon Sep 17 00:00:00 2001 From: evan-forbes Date: Thu, 7 Oct 2021 20:33:42 -0500 Subject: [PATCH 1/6] add WIP workflow --- .../workflows/pull-changes-from-upstream.yml | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/pull-changes-from-upstream.yml diff --git a/.github/workflows/pull-changes-from-upstream.yml b/.github/workflows/pull-changes-from-upstream.yml new file mode 100644 index 0000000000..f2b1e4fda9 --- /dev/null +++ b/.github/workflows/pull-changes-from-upstream.yml @@ -0,0 +1,28 @@ +name: Pull detached upstream from tendermint/tendermint + + +on: + workflow_dispatch: + schedule: + - cron: '0 8 * * 1,4' +jobs: + pull-from-upstream: + 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.GITHUB_TOKEN }} + commit-message: Upstream changes + title: Upstream changes + body: | + - Upstream changes + Auto-generated by [create-pull-request][1] + [1]: https://github.com/peter-evans/create-pull-request + branch: upstream-changes \ No newline at end of file From 9075725a3a3e81c1821105114f72de7a8213bcf5 Mon Sep 17 00:00:00 2001 From: evan-forbes Date: Tue, 12 Oct 2021 16:53:21 -0500 Subject: [PATCH 2/6] update to include 34 release branch --- .../workflows/pull-changes-from-upstream.yml | 44 ++++++++++++++----- 1 file changed, 34 insertions(+), 10 deletions(-) diff --git a/.github/workflows/pull-changes-from-upstream.yml b/.github/workflows/pull-changes-from-upstream.yml index f2b1e4fda9..0af6a9cf03 100644 --- a/.github/workflows/pull-changes-from-upstream.yml +++ b/.github/workflows/pull-changes-from-upstream.yml @@ -1,28 +1,52 @@ -name: Pull detached upstream from tendermint/tendermint - +name: Pull from upstream on: workflow_dispatch: schedule: - cron: '0 8 * * 1,4' jobs: - pull-from-upstream: + 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 remote add upstream https://github.com/tendermint/tendmerint.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.GITHUB_TOKEN }} + 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/tendmerint.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 + title: Upstream changes from the release branch body: | - - Upstream changes - Auto-generated by [create-pull-request][1] - [1]: https://github.com/peter-evans/create-pull-request - branch: upstream-changes \ No newline at end of file + 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: release/v0.34.x-celestia + delete-branch: true + reviewers: evan-forbes \ No newline at end of file From c45a7d1d1e57639b23df648fcb20d1d9a510b2ed Mon Sep 17 00:00:00 2001 From: evan-forbes Date: Tue, 12 Oct 2021 16:56:36 -0500 Subject: [PATCH 3/6] spelling error --- .github/workflows/pull-changes-from-upstream.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-changes-from-upstream.yml b/.github/workflows/pull-changes-from-upstream.yml index 0af6a9cf03..68225ee1dc 100644 --- a/.github/workflows/pull-changes-from-upstream.yml +++ b/.github/workflows/pull-changes-from-upstream.yml @@ -11,7 +11,7 @@ jobs: - uses: actions/checkout@v2 - name: Reset the default branch with upstream changes run: | - git remote add upstream https://github.com/tendermint/tendmerint.git + 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 @@ -34,7 +34,7 @@ jobs: - uses: actions/checkout@v2 - name: Reset the default branch with upstream changes run: | - git remote add upstream https://github.com/tendermint/tendmerint.git + 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 From db31e474df84c501b1e2084cab72cbf009220dd5 Mon Sep 17 00:00:00 2001 From: evan-forbes Date: Tue, 12 Oct 2021 17:09:13 -0500 Subject: [PATCH 4/6] fix branch name --- .github/workflows/pull-changes-from-upstream.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-changes-from-upstream.yml b/.github/workflows/pull-changes-from-upstream.yml index 68225ee1dc..3ccabc0120 100644 --- a/.github/workflows/pull-changes-from-upstream.yml +++ b/.github/workflows/pull-changes-from-upstream.yml @@ -47,6 +47,6 @@ jobs: 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: release/v0.34.x-celestia + base: v0.34.x-celestia delete-branch: true reviewers: evan-forbes \ No newline at end of file From 981538dd74ee5587792b649d906e92bd311c188c Mon Sep 17 00:00:00 2001 From: evan-forbes Date: Tue, 12 Oct 2021 17:14:56 -0500 Subject: [PATCH 5/6] formatting --- .github/workflows/pull-changes-from-upstream.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pull-changes-from-upstream.yml b/.github/workflows/pull-changes-from-upstream.yml index 3ccabc0120..45e22b306b 100644 --- a/.github/workflows/pull-changes-from-upstream.yml +++ b/.github/workflows/pull-changes-from-upstream.yml @@ -49,4 +49,5 @@ jobs: branch: upstream-changes-release/v0.34.x base: v0.34.x-celestia delete-branch: true - reviewers: evan-forbes \ No newline at end of file + reviewers: evan-forbes + \ No newline at end of file From c62270e6623155dd8ee3024fe1909a25502b95f3 Mon Sep 17 00:00:00 2001 From: evan-forbes Date: Tue, 12 Oct 2021 17:22:25 -0500 Subject: [PATCH 6/6] formatting --- .github/workflows/pull-changes-from-upstream.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/pull-changes-from-upstream.yml b/.github/workflows/pull-changes-from-upstream.yml index 45e22b306b..fc5cfea91f 100644 --- a/.github/workflows/pull-changes-from-upstream.yml +++ b/.github/workflows/pull-changes-from-upstream.yml @@ -50,4 +50,3 @@ jobs: base: v0.34.x-celestia delete-branch: true reviewers: evan-forbes - \ No newline at end of file