From 30dc7ccdaf2a72836339a80e37dc3080f6858ee1 Mon Sep 17 00:00:00 2001 From: Kai Waldrant Date: Thu, 20 Jul 2023 16:33:46 +0200 Subject: [PATCH 1/6] remove ns-list workflows --- .github/workflows/integration-test.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 5c7985356e..90cb9dc5a4 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -51,11 +51,11 @@ jobs: src: src format: json - - id: ns_list_workflows - uses: viash-io/viash-actions/ns-list@v4 - with: - src: workflows - format: json + # - id: ns_list_workflows + # uses: viash-io/viash-actions/ns-list@v4 + # with: + # src: workflows + # format: json - id: set_matrix run: | From a1ee7892f54ce32db7ce33cc550068bc0bb7facd Mon Sep 17 00:00:00 2001 From: Kai Waldrant Date: Thu, 20 Jul 2023 16:40:04 +0200 Subject: [PATCH 2/6] update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 44625dad77..b769bf160e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,10 @@ * Update "baseline" to "control" (PR #146). +### BUG FIXES + +* Remove the ns-list action for worklfows in integration test (PR #208) + ## common ### NEW FUNCTIONALITY From a908df60eb45199b7cc3a89ec6a97be1252b5a16 Mon Sep 17 00:00:00 2001 From: Robrecht Cannoodt Date: Fri, 21 Jul 2023 06:08:53 +0200 Subject: [PATCH 3/6] fix set_matrix --- .github/workflows/integration-test.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 90cb9dc5a4..02abaa3513 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -44,19 +44,13 @@ jobs: publish_branch: integration_build exclude_assets: '' - - id: ns_list_components + - id: ns_list uses: viash-io/viash-actions/ns-list@v4 with: platform: docker src: src format: json - # - id: ns_list_workflows - # uses: viash-io/viash-actions/ns-list@v4 - # with: - # src: workflows - # format: json - - id: set_matrix run: | echo "components=$(jq -c '[ .[] | @@ -65,7 +59,7 @@ jobs: "config": .info.config, "dir": .info.config | capture("^(?.*\/)").dir } - ]' ${{ steps.ns_list_components.outputs.output_file }} )" >> $GITHUB_OUTPUT + ]' ${{ steps.ns_list.outputs.output_file }} )" >> $GITHUB_OUTPUT echo "workflows=$(jq -c '[ .[] | . as $config | (.functionality.test_resources // [])[] | select(.type == "nextflow_script", .entrypoint) | { @@ -74,7 +68,7 @@ jobs: "entry": .entrypoint, "config": $config.info.config } - ] | unique' ${{ steps.ns_list_workflows.outputs.output_file }} )" >> $GITHUB_OUTPUT + ] | unique' ${{ steps.ns_list.outputs.output_file }} )" >> $GITHUB_OUTPUT # phase 2 build: From 9cdc29b7474c224658f3011e22216df90f1bedee Mon Sep 17 00:00:00 2001 From: Robrecht Cannoodt Date: Fri, 21 Jul 2023 06:09:19 +0200 Subject: [PATCH 4/6] Fix typo --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b769bf160e..92ccfddc34 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,7 +20,7 @@ ### BUG FIXES -* Remove the ns-list action for worklfows in integration test (PR #208) +* Remove the ns-list action for workflows in integration test (PR #208) ## common From eb31c65b93b8390a420f0f3425e026fdc4d003fc Mon Sep 17 00:00:00 2001 From: Kai Waldrant Date: Mon, 24 Jul 2023 08:26:00 +0200 Subject: [PATCH 5/6] ci force From ea00a93c1855e7e978039fa7426f06e93a7211c7 Mon Sep 17 00:00:00 2001 From: Kai Waldrant Date: Mon, 24 Jul 2023 08:28:15 +0200 Subject: [PATCH 6/6] ci force