From f75228f5f702418bcd382ce2f5530935143ab1b8 Mon Sep 17 00:00:00 2001 From: Diego Date: Mon, 11 Dec 2023 19:31:35 +0100 Subject: [PATCH] try to fix exclude syntax --- .github/workflows/multi_nim.yml | 3 +-- .github/workflows/multi_nim_common.yml | 3 ++- .github/workflows/multi_nim_devel.yml | 3 +-- .github/workflows/multi_nim_legacy.yml | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/multi_nim.yml b/.github/workflows/multi_nim.yml index 2caeb015b2..66817f3659 100644 --- a/.github/workflows/multi_nim.yml +++ b/.github/workflows/multi_nim.yml @@ -10,5 +10,4 @@ jobs: uses: status-im/nim-libp2p/.github/workflows/multi_nim_common.yml@simplifly-ci-matrix with: nim-branch: "['version-1-6','version-2-0']" - cpu: "['amd64']" - exclude: "[]" \ No newline at end of file + cpu: "['amd64']" \ No newline at end of file diff --git a/.github/workflows/multi_nim_common.yml b/.github/workflows/multi_nim_common.yml index 1887f5bded..ba7ee6ce98 100644 --- a/.github/workflows/multi_nim_common.yml +++ b/.github/workflows/multi_nim_common.yml @@ -15,6 +15,7 @@ on: description: 'Exclude matrix configurations' required: false type: string + default: "[]" jobs: delete-cache: @@ -40,7 +41,7 @@ jobs: shell: msys2 {0} branch: ${{ fromJSON(inputs.nim-branch) }} cpu: ${{ fromJSON(inputs.cpu) }} - exclude: ${{ fromJSON(inputs.excludes) }} + exclude: ${{ fromJSON(inputs.exclude) }} defaults: run: diff --git a/.github/workflows/multi_nim_devel.yml b/.github/workflows/multi_nim_devel.yml index 667462886c..27b0aa4fdd 100644 --- a/.github/workflows/multi_nim_devel.yml +++ b/.github/workflows/multi_nim_devel.yml @@ -10,5 +10,4 @@ jobs: uses: status-im/nim-libp2p/.github/workflows/multi_nim_common.yml@simplifly-ci-matrix with: nim-branch: "['devel']" - cpu: "['amd64']" - exclude: "['']" \ No newline at end of file + cpu: "['amd64']" \ No newline at end of file diff --git a/.github/workflows/multi_nim_legacy.yml b/.github/workflows/multi_nim_legacy.yml index 90eb1396ca..f77265709f 100644 --- a/.github/workflows/multi_nim_legacy.yml +++ b/.github/workflows/multi_nim_legacy.yml @@ -11,4 +11,4 @@ jobs: with: nim-branch: "['version-1-6','version-2-0', 'devel']" cpu: "['i386']" - exclude: "[{'os':'macos'}" + exclude: "[{'platform': {'os':'macos'}]}"