From 97a0298e01d49a1f708d6cc47c2c1fb4dc795b47 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Thu, 20 Oct 2022 13:47:20 -0700 Subject: [PATCH] Add github action to merge master to feature branches --- .github/workflows/branch-merge.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/workflows/branch-merge.yml diff --git a/.github/workflows/branch-merge.yml b/.github/workflows/branch-merge.yml new file mode 100644 index 0000000000..d1900f462d --- /dev/null +++ b/.github/workflows/branch-merge.yml @@ -0,0 +1,21 @@ +name: Merge master into feature/lsp-engine +on: + schedule: + - cron: '0 */3 * * *' +jobs: + Create-Merge-PR: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + ref: feature/lsp-engine + - name: Get changes from master + run: | + git remote add upstream https://github.com/OmniSharp/omnisharp-vscode.git + git fetch upstream master:upstream-master + git reset --hard upstream-master + - name: Create Pull Request + uses: peter-evans/create-pull-request@v4 + with: + title: Merge master into feature/lsp-engine + branch: merge-master-to-feature-lsp-engine