Skip to content

Commit 43403f2

Browse files
authored
migrate to new plugin structure (#105)
closes #104 Signed-off-by: Jorge Aguilera <[email protected]>
1 parent dad6d7b commit 43403f2

File tree

71 files changed

+50
-548
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+50
-548
lines changed

.github/workflows/release.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ jobs:
1212
build:
1313
name: Build
1414
runs-on: ubuntu-latest
15+
if: ${{ github.actor == 'jagedn' || github.actor == 'abhi18av' }}
1516
timeout-minutes: 90
1617
strategy:
1718
fail-fast: false
@@ -55,7 +56,7 @@ jobs:
5556
architecture: x64
5657

5758
- name: build artifacts
58-
run: ./gradlew clean jsonPlugin -x test -P version=${GITHUB_REF#refs/tags/}
59+
run: ./gradlew clean installPlugin -x test -P version=${GITHUB_REF#refs/tags/}
5960

6061
- name: Upload artifact and release
6162
uses: softprops/action-gh-release@v2
@@ -64,4 +65,7 @@ jobs:
6465
prerelease: false
6566
body_path: CHANGELOG.md
6667
files: |
67-
./plugins/nf-nomad/build/plugin/*
68+
./build/distributions/*
69+
70+
- name: publish release
71+
run: ./gradlew releasePlugin -x test -P version=${GITHUB_REF#refs/tags/}

build.gradle

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,19 @@
1-
buildscript {
2-
repositories {
3-
mavenCentral()
4-
}
5-
}
6-
71
plugins {
2+
id 'io.nextflow.nextflow-plugin' version '1.0.0-beta.6'
83
id 'org.antora' version '1.0.0'
94
}
105

11-
repositories {
12-
mavenCentral()
13-
}
14-
15-
import nextflow.gradle.plugins.NextflowPlugin
6+
dependencies {
7+
implementation "es.edn:nomad-client-java:1.7.6"
168

17-
apply plugin: NextflowPlugin
9+
testImplementation 'com.squareup.okhttp3:mockwebserver:4.9.3'
10+
}
1811

19-
nextflowPlugin{
20-
githubOrganization = github_organization
21-
extensionPoints = [
22-
]
12+
test {
13+
useJUnitPlatform()
14+
jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED'
15+
environment 'NOMAD_ADDR', 'http://test-nf-nomad'
16+
environment 'NOMAD_DC', 'dc-test'
2317
}
2418

2519
node {
@@ -36,4 +30,16 @@ antora {
3630
]
3731
environment = [:]
3832
packages = [:]
39-
}
33+
}
34+
35+
nextflowPlugin {
36+
nextflowVersion = '24.10.4'
37+
38+
provider = 'nextflow-io'
39+
className = 'nextflow.nomad.NomadPlugin'
40+
extensionPoints = [
41+
'nextflow.nomad.executor.NomadExecutor',
42+
'nextflow.nomad.secrets.NomadSecretProvider'
43+
]
44+
45+
}

buildSrc/build.gradle

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

buildSrc/src/main/groovy/nextflow/gradle/plugins/GenerateIdxTask.groovy

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

buildSrc/src/main/groovy/nextflow/gradle/plugins/JsonPluginTask.groovy

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

buildSrc/src/main/groovy/nextflow/gradle/plugins/NextflowPlugin.groovy

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

buildSrc/src/main/groovy/nextflow/gradle/plugins/NextflowPluginExtension.groovy

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

buildSrc/src/main/groovy/nextflow/gradle/plugins/SourcesMatcher.groovy

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

buildSrc/src/main/groovy/nextflow/gradle/plugins/UnzipPluginTask.groovy

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

0 commit comments

Comments
 (0)