From 962a709489715a96e5ecd9a08418a9448ad176e0 Mon Sep 17 00:00:00 2001 From: Tom Date: Sun, 6 Jun 2021 14:15:34 -0400 Subject: [PATCH 1/3] Adding auto branch merge --- .github/workflows/merge-branch.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .github/workflows/merge-branch.yml diff --git a/.github/workflows/merge-branch.yml b/.github/workflows/merge-branch.yml new file mode 100644 index 0000000..1420cd5 --- /dev/null +++ b/.github/workflows/merge-branch.yml @@ -0,0 +1,15 @@ +on: + push: + branches: + - "dev" +jobs: + merge-branch: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: everlytic/branch-merge@1.1.0 + with: + github_token: ${{ github.token }} + source_ref: 'dev' + target_branch: 'gh-pages' + commit_message_template: '[Automated] Merged {source_ref} into {target_branch}' From 977c25e77ae2bc81e20f73483bd15d3b21e988b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Noord?= <13665637+DanielNoord@users.noreply.github.com> Date: Mon, 7 Jun 2021 08:55:16 +0200 Subject: [PATCH 2/3] Update and rename merge-branch.yml to publish-dev.yml --- .github/workflows/{merge-branch.yml => publish-dev.yml} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename .github/workflows/{merge-branch.yml => publish-dev.yml} (72%) diff --git a/.github/workflows/merge-branch.yml b/.github/workflows/publish-dev.yml similarity index 72% rename from .github/workflows/merge-branch.yml rename to .github/workflows/publish-dev.yml index 1420cd5..e19cd38 100644 --- a/.github/workflows/merge-branch.yml +++ b/.github/workflows/publish-dev.yml @@ -3,7 +3,7 @@ on: branches: - "dev" jobs: - merge-branch: + publish-dev: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -12,4 +12,4 @@ jobs: github_token: ${{ github.token }} source_ref: 'dev' target_branch: 'gh-pages' - commit_message_template: '[Automated] Merged {source_ref} into {target_branch}' + commit_message_template: '[Automated] Merge {source_ref} into {target_branch}' From be245da05faba4cc48dc5e63a2c03b94dff350ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Noord?= <13665637+DanielNoord@users.noreply.github.com> Date: Mon, 7 Jun 2021 08:56:27 +0200 Subject: [PATCH 3/3] Update publish-dev.yml --- .github/workflows/publish-dev.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish-dev.yml b/.github/workflows/publish-dev.yml index e19cd38..4428658 100644 --- a/.github/workflows/publish-dev.yml +++ b/.github/workflows/publish-dev.yml @@ -1,3 +1,4 @@ +name: Publish on: push: branches: