From 474665ec8e4995108adfd4f98c6a180d11d2083f Mon Sep 17 00:00:00 2001 From: galargh Date: Fri, 10 Dec 2021 12:25:49 +0100 Subject: [PATCH 1/2] Revert "Merge pull request #231 from protocol/concurrency" This reverts commit 38135c75e47839623bf9b2748275d8c6167a8fa8, reversing changes made to 7ec52ff378c66e8cc0d2d70d8908aad5c209fa1e. --- .github/workflows/copy-workflow.yml | 4 ---- .github/workflows/dispatch.yml | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/copy-workflow.yml b/.github/workflows/copy-workflow.yml index f290bbbb..fca2bc0f 100644 --- a/.github/workflows/copy-workflow.yml +++ b/.github/workflows/copy-workflow.yml @@ -14,9 +14,6 @@ on: targets: description: "List of repositories to deploy to" required: true - concurrency_group: - description: "Concurrency Group" - required: true jobs: copy: @@ -25,7 +22,6 @@ jobs: fail-fast: false matrix: cfg: ${{ fromJson(github.event.inputs.targets) }} - concurrency: copy-${{ github.event.inputs.concurrency_group }} env: TARGET_REPO_DIR: "target-repo" TEMPLATE_REPO_DIR: "template-repo" diff --git a/.github/workflows/dispatch.yml b/.github/workflows/dispatch.yml index 0e9f1dfa..22fd35ea 100644 --- a/.github/workflows/dispatch.yml +++ b/.github/workflows/dispatch.yml @@ -52,4 +52,4 @@ jobs: with: workflow: "Deploy" # "name" attribute of copy-workflow.yml token: ${{ secrets.WEB3BOT_GITHUB_TOKEN }} - inputs: '{ "head_commit_url": ${{ toJson(github.event.head_commit.url) }}, "files": ${{ toJson(env.FILES) }}, "targets": ${{ toJson(toJson(matrix.cfg.value)) }}, "concurrency_group": "${{ matrix.cfg.key }}" }' + inputs: '{ "head_commit_url": ${{ toJson(github.event.head_commit.url) }}, "files": ${{ toJson(env.FILES) }}, "targets": ${{ toJson(toJson(matrix.cfg.value)) }} }' From 0bc58c8cdfecde929731466ed4409cb469bd23ff Mon Sep 17 00:00:00 2001 From: galargh Date: Fri, 10 Dec 2021 12:28:53 +0100 Subject: [PATCH 2/2] set max-parallel=1 on copy-workflow matrix --- .github/workflows/copy-workflow.yml | 1 + .github/workflows/dispatch.yml | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/copy-workflow.yml b/.github/workflows/copy-workflow.yml index fca2bc0f..61cc9f12 100644 --- a/.github/workflows/copy-workflow.yml +++ b/.github/workflows/copy-workflow.yml @@ -22,6 +22,7 @@ jobs: fail-fast: false matrix: cfg: ${{ fromJson(github.event.inputs.targets) }} + max-parallel: 1 env: TARGET_REPO_DIR: "target-repo" TEMPLATE_REPO_DIR: "template-repo" diff --git a/.github/workflows/dispatch.yml b/.github/workflows/dispatch.yml index 22fd35ea..d7e78e02 100644 --- a/.github/workflows/dispatch.yml +++ b/.github/workflows/dispatch.yml @@ -8,8 +8,7 @@ on: env: # Number of repositories in a batch. - # Deployment jobs in the same batch use the same concurrency group, - # and are therefore run sequentially. + # Deployment jobs in the same batch are run sequentially. # With ~180 repos, this means we'll run around 9 instances of the copy workflow in parallel. # This is (hopefully) sufficient to prevent us from triggering GitHub Action's abuse detection mechanism. MAX_REPOS_PER_WORKFLOW: 20