Skip to content

Commit 01677e5

Browse files
authored
Release 1.4.0
1 parent 0f573c0 commit 01677e5

4 files changed

Lines changed: 25 additions & 133 deletions

File tree

.github/workflows/build.yml

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
name: nf-ga4gh CI
22
on:
33
push:
4+
branches:
5+
- 'master'
6+
pull_request:
7+
types: [opened, reopened, synchronize]
8+
workflow_dispatch:
49

510
jobs:
611
build:
@@ -12,7 +17,7 @@ jobs:
1217
fail-fast: false
1318
matrix:
1419
java_version: [
15-
17,
20+
17,
1621
21,
1722
]
1823

@@ -31,13 +36,10 @@ jobs:
3136
with:
3237
java-version: ${{matrix.java_version}}
3338
distribution: 'temurin'
34-
cache: 'gradle'
35-
36-
- name: Compile
37-
run: ./gradlew assemble
39+
cache: 'gradle'
3840

39-
- name: Tests
40-
run: ./gradlew check
41+
- name: Unit tests
42+
run: make test
4143
env:
4244
GRADLE_OPTS: '-Dorg.gradle.daemon=false'
4345

@@ -71,15 +73,15 @@ jobs:
7173
distribution: 'temurin'
7274
cache: 'gradle'
7375

74-
- name: Install Plugin
75-
run: |
76-
make install
77-
7876
- name: Install Nextflow ${{ matrix.nextflow_version }}
7977
uses: nf-core/setup-nextflow@v2
8078
with:
8179
version: ${{ matrix.nextflow_version }}
8280

81+
- name: Install Plugin
82+
run: |
83+
make install
84+
8385
- name: Install TES Server
8486
run: |
8587
# https://github.com/ohsu-comp-bio/funnel/releases/tag/v0.11.8
@@ -92,19 +94,16 @@ jobs:
9294
- name: Get plugin version
9395
shell: bash
9496
run: |
95-
PLUGIN_VERSION="$(./gradlew -q properties | awk -F': ' '/^version:/ {print $2; exit}')"
97+
PLUGIN_VERSION="$(cat VERSION)"
9698
echo "PLUGIN_VERSION=${PLUGIN_VERSION}" >> "$GITHUB_ENV"
9799
echo "Using plugin version: ${PLUGIN_VERSION}"
98100
99101
- name: Install nf-canary
100102
run: |
101-
cd ..
102-
git clone https://github.com/seqeralabs/nf-canary
103-
cd nf-canary
104-
cat <<EOF > nextflow.config.tes
103+
cat <<EOF > nextflow.config
105104
// Nextflow config file for running on TES Backend
106105
plugins {
107-
id "nf-ga4gh@${PLUGIN_VERSION}"
106+
id 'nf-ga4gh@${PLUGIN_VERSION}'
108107
}
109108
process {
110109
executor = 'tes'
@@ -116,23 +115,20 @@ jobs:
116115
basicUsername = null
117116
basicPassword = null
118117
}
118+
report.enabled = true
119+
timeline.enabled = true
119120
EOF
120121
121122
- name: Run nf-canary
122123
run: |
123-
cd ../nf-canary
124124
export NXF_ANSI_LOG=false
125-
nextflow run main.nf \
126-
-config nextflow.config.tes \
127-
-with-report report.html \
128-
-with-timeline timeline.html
125+
nextflow run seqeralabs/nf-canary
129126
130127
- name: Stage Reports
131128
if: always()
132129
run: |
133130
mkdir -p $GITHUB_WORKSPACE/results
134-
cd ../nf-canary
135-
131+
136132
# Nextflow Logs
137133
cp -f report.html timeline.html .nextflow.log $GITHUB_WORKSPACE/results/ || true
138134

VERSION

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.4.0

build.gradle

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
1-
// Plugins
21
plugins {
3-
// https://github.com/nextflow-io/nextflow-plugin-gradle/tree/v1.0.0-beta.14
42
id 'io.nextflow.nextflow-plugin' version '1.0.0-beta.14'
53
}
64

7-
// Dependencies
85
dependencies {
9-
compileOnly "io.nextflow:nextflow:25.10.4"
10-
compileOnly "org.apache.groovy:groovy:4.0.21"
11-
compileOnly "org.pf4j:pf4j:3.10.0"
12-
compileOnly "org.slf4j:slf4j-api:2.0.7"
13-
6+
// required by the auto-generated TES Java SDK
147
api "com.google.code.gson:gson:2.11.0"
158
api "com.squareup.okhttp:logging-interceptor:2.7.5"
169
api "com.squareup.okhttp:okhttp:2.7.5"
@@ -20,16 +13,12 @@ dependencies {
2013
api "org.threeten:threetenbp:1.3.5"
2114
}
2215

23-
// Plugin version
24-
version = '1.3.1'
16+
version = project.file('VERSION').text.trim()
2517

26-
// Nextflow plugin configuration
2718
nextflowPlugin {
28-
// Minimum Nextflow version
29-
nextflowVersion = '25.10.4'
19+
nextflowVersion = '25.10.0'
3020

31-
// Plugin metadata
32-
provider = 'nextflow-io'
21+
provider = 'nextflow'
3322
className = 'nextflow.ga4gh.Ga4ghPlugin'
3423
extensionPoints = [
3524
'nextflow.ga4gh.tes.executor.TesExecutor'

plugins/nf-ga4gh/build.gradle

Lines changed: 0 additions & 94 deletions
This file was deleted.

0 commit comments

Comments
 (0)