From ab80815201e0580ab62a2351284e30029100a8e4 Mon Sep 17 00:00:00 2001 From: Marcin Date: Wed, 18 Oct 2023 13:46:30 +0200 Subject: [PATCH 1/5] A0-3232: Automatic upstream merge --- .../workflows/automatic-upstream-merge-pr.yml | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/workflows/automatic-upstream-merge-pr.yml diff --git a/.github/workflows/automatic-upstream-merge-pr.yml b/.github/workflows/automatic-upstream-merge-pr.yml new file mode 100644 index 00000000000..645ac07186d --- /dev/null +++ b/.github/workflows/automatic-upstream-merge-pr.yml @@ -0,0 +1,35 @@ +--- +name: Automatic upstream merge + +on: + # run on 1th and 15th day of any month, ie fortnightly + schedule: + - cron: '* * 1,15 * *' + # for testing, remove before merge + push: + branches: + - A0-3232 + +concurrency: + group: ${{ github.ref }}-${{ github.workflow }} + cancel-in-progress: true + +jobs: + main: + name: Merge polkadot-js/apps + runs-on: ubuntu-20.04 + steps: + - name: Checkout source code + uses: actions/checkout@v3 + + - name: Merge upstream repo + uses: Cardinal-Cryptography/github-actions/test-upsteam-merge@v3 + with: + target-repo: Cardinal-Cryptography/azero-dev + target-branch: alephzero + upstream-repo-url: https://github.com/polkadot-js/apps + upstream-branch: master + slack-webhook-url: ${{ secrets.SLACK_INCOMING_WEBHOOK_TEMP_SLACK_NOTIFICATIONS }} + git-commit-author: ${{ secrets.AUTOCOMMIT_AUTHOR }} + git-commit-email: ${{ secrets.AUTOCOMMIT_EMAIL }} + gh-ci-token: ${{ secrets.CI_GH_TOKEN }} From bba50a23d08cb1b722f0d3f485c46a1a59505239 Mon Sep 17 00:00:00 2001 From: Marcin Date: Wed, 18 Oct 2023 13:54:40 +0200 Subject: [PATCH 2/5] Typo in action name --- .github/workflows/automatic-upstream-merge-pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/automatic-upstream-merge-pr.yml b/.github/workflows/automatic-upstream-merge-pr.yml index 645ac07186d..b7a3bc5566e 100644 --- a/.github/workflows/automatic-upstream-merge-pr.yml +++ b/.github/workflows/automatic-upstream-merge-pr.yml @@ -1,5 +1,5 @@ --- -name: Automatic upstream merge +name: Automatic upstream merge on: # run on 1th and 15th day of any month, ie fortnightly @@ -23,7 +23,7 @@ jobs: uses: actions/checkout@v3 - name: Merge upstream repo - uses: Cardinal-Cryptography/github-actions/test-upsteam-merge@v3 + uses: Cardinal-Cryptography/github-actions/test-upstream-merge@v3 with: target-repo: Cardinal-Cryptography/azero-dev target-branch: alephzero From 3bf4168b1f4ff18f1cf25893e7bbc6315ae13f26 Mon Sep 17 00:00:00 2001 From: Marcin Date: Thu, 9 Nov 2023 14:32:35 +0100 Subject: [PATCH 3/5] Changed slack channel and cron schedule --- .github/workflows/automatic-upstream-merge-pr.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/automatic-upstream-merge-pr.yml b/.github/workflows/automatic-upstream-merge-pr.yml index b7a3bc5566e..0be7be1a8af 100644 --- a/.github/workflows/automatic-upstream-merge-pr.yml +++ b/.github/workflows/automatic-upstream-merge-pr.yml @@ -4,15 +4,11 @@ name: Automatic upstream merge on: # run on 1th and 15th day of any month, ie fortnightly schedule: - - cron: '* * 1,15 * *' - # for testing, remove before merge - push: - branches: - - A0-3232 + - cron: '1 0 1,15 * *' concurrency: group: ${{ github.ref }}-${{ github.workflow }} - cancel-in-progress: true + cancel-in-progress: false jobs: main: @@ -29,7 +25,7 @@ jobs: target-branch: alephzero upstream-repo-url: https://github.com/polkadot-js/apps upstream-branch: master - slack-webhook-url: ${{ secrets.SLACK_INCOMING_WEBHOOK_TEMP_SLACK_NOTIFICATIONS }} + slack-webhook-url: ${{ secrets.SLACK_INCOMING_WEBHOOK_DEV_ONDUTY }} git-commit-author: ${{ secrets.AUTOCOMMIT_AUTHOR }} git-commit-email: ${{ secrets.AUTOCOMMIT_EMAIL }} gh-ci-token: ${{ secrets.CI_GH_TOKEN }} From 3515f00d25034333b588c83add4249c574fe9014 Mon Sep 17 00:00:00 2001 From: Marcin Date: Fri, 10 Nov 2023 11:33:15 +0100 Subject: [PATCH 4/5] Testing --- .github/workflows/automatic-upstream-merge-pr.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/automatic-upstream-merge-pr.yml b/.github/workflows/automatic-upstream-merge-pr.yml index 0be7be1a8af..40515904a7f 100644 --- a/.github/workflows/automatic-upstream-merge-pr.yml +++ b/.github/workflows/automatic-upstream-merge-pr.yml @@ -2,9 +2,13 @@ name: Automatic upstream merge on: - # run on 1th and 15th day of any month, ie fortnightly + # run on 7th and 21th day of any month, ie fortnightly schedule: - - cron: '1 0 1,15 * *' + - cron: '1 0 7,21 * *' + #testing, remove before merge + push: + branches: + - A0-3232 concurrency: group: ${{ github.ref }}-${{ github.workflow }} From 5537688e90f3b3d6e58f7b5e82b2fa9130d7c333 Mon Sep 17 00:00:00 2001 From: Marcin Date: Fri, 10 Nov 2023 11:43:54 +0100 Subject: [PATCH 5/5] Remove testing code. --- .github/workflows/automatic-upstream-merge-pr.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/automatic-upstream-merge-pr.yml b/.github/workflows/automatic-upstream-merge-pr.yml index 40515904a7f..e8ddbd3f398 100644 --- a/.github/workflows/automatic-upstream-merge-pr.yml +++ b/.github/workflows/automatic-upstream-merge-pr.yml @@ -5,10 +5,6 @@ on: # run on 7th and 21th day of any month, ie fortnightly schedule: - cron: '1 0 7,21 * *' - #testing, remove before merge - push: - branches: - - A0-3232 concurrency: group: ${{ github.ref }}-${{ github.workflow }}