From c48961178bbb849f44ed49be91790de64a5fc865 Mon Sep 17 00:00:00 2001 From: Robrecht Cannoodt Date: Mon, 17 Jun 2024 11:16:25 +0200 Subject: [PATCH] override viash version --- .github/workflows/main-build.yml | 15 +++++++++------ _viash.yaml | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main-build.yml b/.github/workflows/main-build.yml index cee0550..6172bf3 100644 --- a/.github/workflows/main-build.yml +++ b/.github/workflows/main-build.yml @@ -30,10 +30,13 @@ jobs: if: ${{ hashFiles('~/.local/bin/viash') == '' }} with: version: ${{ matrix.viash_version }} - - - if: ${{ startsWith(matrix.name, 'build_0_9') }} + + - name: Specify Viash version run: | - cp _viash_0.9.yaml _viash.yaml + if [[ ${{ matrix.name }} ~= "build_0_9" ]]; then + cp _viash_0.9.yaml _viash.yaml + fi + echo "viash_version: ${{ matrix.viash_version }}" >> _viash.yaml - name: Remove target folder from .gitignore run: | @@ -42,7 +45,7 @@ jobs: - uses: viash-io/viash-actions/ns-build@v5 with: - config_mod: .functionality.version := '${{ matrix.name }}' + config_mod: ${{ matrix.config_mod }} parallel: true - name: Deploy to target branch @@ -56,7 +59,7 @@ jobs: uses: viash-io/viash-actions/ns-build@v5 with: parallel: true - config_mod: .functionality.version := '${{ matrix.name }}' + config_mod: ${{ matrix.config_mod }} platform: docker setup: build @@ -70,6 +73,6 @@ jobs: - name: Push container uses: viash-io/viash-actions/ns-build@v5 with: - config_mod: .functionality.version := '${{ matrix.name }}' + config_mod: ${{ matrix.config_mod }} platform: docker setup: push diff --git a/_viash.yaml b/_viash.yaml index 792affc..a44447e 100644 --- a/_viash.yaml +++ b/_viash.yaml @@ -8,4 +8,4 @@ config_mods: | .platforms[.type == 'docker'].target_organization := 'viash-io/test-nextflow-wave-fusion' .platforms[.type == 'docker'].target_image_source := 'https://github.com/viash-io/test-nextflow-wave-fusion' .platforms[.type == 'nextflow'].directives.tag := '$id' - .platforms[.type == 'nextflow'].auto.simplifyOutput := false \ No newline at end of file + .platforms[.type == 'nextflow'].auto.simplifyOutput := false