diff --git a/.github/actions/nf-test-action/action.yml b/.github/actions/nf-test-action/action.yml index 5e30fed7b89..a656fadbb00 100644 --- a/.github/actions/nf-test-action/action.yml +++ b/.github/actions/nf-test-action/action.yml @@ -1,9 +1,6 @@ name: "nf-test Action" description: "Runs nf-test with common setup steps" inputs: - path: - description: "Path to test" - required: false profile: description: "Profile to use" required: true @@ -13,6 +10,9 @@ inputs: total_shards: description: "Total number of test shards(NOT the total number of matrix jobs)" required: true + tags: + description: "Tags to test (`[,...]`)" + required: false runs: using: "composite" @@ -70,6 +70,7 @@ runs: env: SENTIEON_LICSRVR_IP: ${{ env.SENTIEON_LICSRVR_IP }} SENTIEON_AUTH_MECH: "GitHub Actions - token" + TAGS: ${{ inputs.tags && format('--tag {0}', inputs.tags) || '' }} run: | NFT_WORKDIR=~ \ nf-test test \ @@ -77,11 +78,11 @@ runs: --tap=test.tap \ --verbose \ --ci \ - # FIXME this doesn't work with a path? --changed-since HEAD^ \ + --changed-since HEAD^ \ --shard ${{ inputs.shard }}/${{ inputs.total_shards }} \ --filter process,workflow \ --follow-dependencies \ - ${{ inputs.path }} + ${{ env.TAGS }} # TODO If no test.tap, then make one to spoof? - uses: pcolby/tap-summary@0959cbe1d4422e62afc65778cdaea6716c41d936 # v1 diff --git a/.github/workflows/gpu-tests.yml b/.github/workflows/gpu-tests.yml index 9c7e02483b3..a6634f9047e 100644 --- a/.github/workflows/gpu-tests.yml +++ b/.github/workflows/gpu-tests.yml @@ -45,11 +45,11 @@ jobs: shard: [1, 2] # TODO Pass these in from GitHub PR trigger events include: - - path: modules/nf-core/parabricks/applybqsr + - tags: parabricks/applybqsr profile: [docker_self_hosted, singularity] - - path: modules/nf-core/parabricks/fq2bam + - tags: parabricks/fq2bam profile: [docker_self_hosted, singularity] - - path: modules/nf-core/parabricks/fq2bammeth + - tags: parabricks/fq2bammeth profile: [docker_self_hosted, singularity] env: NXF_ANSI_LOG: false @@ -67,8 +67,7 @@ jobs: SENTIEON_LICSRVR_IP: ${{ secrets.SENTIEON_LICSRVR_IP }} SENTIEON_AUTH_MECH: "GitHub Actions - token" with: - path: ${{ matrix.path }} profile: ${{ matrix.profile }},gpu shard: ${{ matrix.shard }} total_shards: ${{ env.TOTAL_SHARDS }} - # TODO Pass a "gpu" tag in case there's cpu only tests + tags: ${{matrix.tags}},gpu