Skip to content

Commit 3dea064

Browse files
committed
re-enable original tests & steps
1 parent c5aad12 commit 3dea064

1 file changed

Lines changed: 19 additions & 20 deletions

File tree

.github/workflows/sbt_test.yml

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -84,31 +84,30 @@ jobs:
8484
with:
8585
python-version: '3.x'
8686

87-
# - name: Set up Nextflow
88-
# if: ${{ runner.os == 'Linux' && matrix.java.run_nextflow }}
89-
# uses: nf-core/setup-nextflow@v2
90-
# with:
91-
# version: ${{ matrix.java.nxf_ver }}
87+
- name: Set up Nextflow
88+
if: ${{ runner.os == 'Linux' && matrix.java.run_nextflow }}
89+
uses: nf-core/setup-nextflow@v2
90+
with:
91+
version: ${{ matrix.java.nxf_ver }}
9292

9393
- name: Run tests
9494
env:
9595
NXF_SYNTAX_PARSER: v1
9696
run: |
97-
# if [[ "${{ matrix.config.name }}" =~ ^ubuntu.*$ ]] && [[ "${{ matrix.java.run_coverage }}" == "true" ]]; then
98-
# # only run coverage on main runner
99-
# sbt clean coverage test coverageReport
100-
# elif [[ "${{ matrix.config.name }}" =~ ^ubuntu.*$ ]] && [[ "${{ matrix.java.run_nextflow }}" == "false" ]]; then
101-
# sbt 'testOnly -- -l io.viash.NextflowTest'
102-
# elif [[ "${{ matrix.config.os }}" =~ ^macos.*$ ]]; then
103-
# # macOS on github actions does not have Docker, so skip those
104-
# sbt 'testOnly -- -l io.viash.DockerTest -l io.viash.NextflowTest'
105-
# else
106-
# sbt test
107-
# fi
108-
sbt "testOnly *JsonParserTest"
109-
110-
# - name: Upload coverage on success
111-
# run: bash <(curl -s https://codecov.io/bash)
97+
if [[ "${{ matrix.config.name }}" =~ ^ubuntu.*$ ]] && [[ "${{ matrix.java.run_coverage }}" == "true" ]]; then
98+
# only run coverage on main runner
99+
sbt clean coverage test coverageReport
100+
elif [[ "${{ matrix.config.name }}" =~ ^ubuntu.*$ ]] && [[ "${{ matrix.java.run_nextflow }}" == "false" ]]; then
101+
sbt 'testOnly -- -l io.viash.NextflowTest'
102+
elif [[ "${{ matrix.config.os }}" =~ ^macos.*$ ]]; then
103+
# macOS on github actions does not have Docker, so skip those
104+
sbt 'testOnly -- -l io.viash.DockerTest -l io.viash.NextflowTest'
105+
else
106+
sbt test
107+
fi
108+
109+
- name: Upload coverage on success
110+
run: bash <(curl -s https://codecov.io/bash)
112111

113112
- name: Upload check results on fail
114113
if: failure()

0 commit comments

Comments
 (0)