From 4512e707c3a8633155af0d268778cee623505167 Mon Sep 17 00:00:00 2001 From: eitsupi Date: Tue, 7 May 2024 12:03:56 +0000 Subject: [PATCH 1/2] ci: fix for concurrency deadlock --- .github/workflows/extra.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/extra.yml b/.github/workflows/extra.yml index 54ed8ab0..c702b35b 100644 --- a/.github/workflows/extra.yml +++ b/.github/workflows/extra.yml @@ -21,9 +21,10 @@ on: type: string required: false -concurrency: - group: ${{ github.workflow }} - cancel-in-progress: true +# TODO: reconsider +# concurrency: +# group: ${{ github.workflow }} +# cancel-in-progress: true jobs: generate_matrix: From 5723340a0a4551bd67cf252397f1b0eba738bcdd Mon Sep 17 00:00:00 2001 From: eitsupi Date: Tue, 7 May 2024 12:16:57 +0000 Subject: [PATCH 2/2] ci: fix the logic --- .github/workflows/extra.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/extra.yml b/.github/workflows/extra.yml index c702b35b..97d8f67c 100644 --- a/.github/workflows/extra.yml +++ b/.github/workflows/extra.yml @@ -40,7 +40,7 @@ jobs: if [[ "${{ inputs.all-versions }}" == "true" ]]; then JSON="build/matrix/latest-two.json" fi - if [[ -n "${{ inputs.group }}" ]]; then + if [[ -z "${{ inputs.group }}" ]]; then CONTENT="$(jq -s -r '.[0] + { group: [.[1].group[] | keys[] | select(. != "default")] } | tostring' $JSON build/templates/bakefiles/extra.docker-bake.json)" else CONTENT="$(jq -r '.group = ["${{ inputs.group }}"] | tostring' $JSON)"