Skip to content

Commit

Permalink
Merge pull request #91 from tillenglert/Align_to_latest_nextflow
Browse files Browse the repository at this point in the history
Align to latest Nextflow version and bump to groovy 4.0
  • Loading branch information
tillenglert authored Oct 10, 2024
2 parents c01bbde + 96db2e7 commit b604b7a
Show file tree
Hide file tree
Showing 9 changed files with 224 additions and 128 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,29 +17,29 @@ jobs:
strategy:
fail-fast: false
matrix:
java_version: [8, 11]
java_version: [11, 21]

steps:
- name: Environment
run: env | sort

- name: Checkout
uses: actions/checkout@v1
uses: actions/checkout@v3
with:
fetch-depth: 1
submodules: true

- name: Setup Java ${{ matrix.java_version }}
uses: actions/setup-java@v1
uses: actions/setup-java@v3
with:
java-version: ${{matrix.java_version}}
architecture: x64
distribution: 'temurin'

- name: Compile
run: ./gradlew assemble

- name: Tests
run: ./gradlew check
env:
GRADLE_OPTS: '-Dorg.gradle.daemon=false'

GRADLE_OPTS: '-Dorg.gradle.daemon=false'
7 changes: 7 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ NXF_HOME ?= $$HOME/.nextflow
NXF_PLUGINS_DIR ?= $(NXF_HOME)/plugins

clean:
rm -rf .nextflow*
rm -rf work
rm -rf build
rm -rf plugins/*/build
./gradlew clean

compile:
Expand Down Expand Up @@ -48,6 +52,9 @@ else
./gradlew ${mm}test --tests ${class}
endif

assemble:
./gradlew assemble

install:
./gradlew copyPluginZip
rm -rf ${NXF_PLUGINS_DIR}/nf-co2footprint-${version}
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit b604b7a

Please sign in to comment.