Skip to content

Commit 1587653

Browse files
committed
Merge branch 'master' into azure_batch_no_container_spec
Signed-off-by: adamrtalbot <12817534+adamrtalbot@users.noreply.github.com>
2 parents 7c75bbf + 579873b commit 1587653

File tree

836 files changed

+89456
-4620
lines changed

Some content is hidden

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

836 files changed

+89456
-4620
lines changed

.github/CODEOWNERS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
# DOCUMENTATION -------------------------------------------------------
22
# Docs folder ownership
33
/docs/ @nextflow-io/docs
4+
5+
# COMPILER ------------------------------------------------------------
6+
# nf-lang module
7+
/modules/nf-lang/ @nextflow-io/lang

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
11
---
22
name: Bug report
3-
about: Create a report to help us improve
3+
about: Report a bug to help us improve
44
---
55

66
## Bug report
77

8-
(Please follow this template replacing the text between parentheses with the requested information)
8+
(Please follow this template by replacing the text between parentheses with the requested information)
99

1010
### Expected behavior and actual behavior
1111

12-
(Give an brief description of the expected behavior
13-
and actual behavior)
12+
(Give a brief description of the expected behavior and actual behavior)
1413

1514
### Steps to reproduce the problem
1615

17-
(Provide a test case that reproduce the problem either with a self-contained script or GitHub repository)
16+
(Provide a test case that reproduces the problem either with a self-contained script or GitHub repository)
1817

1918
### Program output
2019

21-
(Copy and paste here output produced by the failing execution. Please highlight it as a code block. Whenever possible upload the `.nextflow.log` file.)
20+
(Copy and paste the output produced by the failing execution. Please highlight it as a code block. Whenever possible upload the `.nextflow.log` file.)
2221

2322
### Environment
2423

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,8 @@
11
---
22
name: General question
3-
about: Need for help on Nextflow language and usage
3+
about: Ask for help with Nextflow language and usage
44
---
55

66
Hi! Thanks for using Nextflow.
77

8-
If you need help about Nextflow scripting language,
9-
configuration options and general Nextflow usage the better
10-
channels to post this kind of questions are:
11-
12-
* GitHub discussions: https://github.com/nextflow-io/nextflow/discussions
13-
* Slack community chat: https://www.nextflow.io/slack-invite.html
14-
15-
16-
Also you may also want to have a look at the patterns page
17-
for common solutions to recurrent implementation problems:
18-
http://nextflow-io.github.io/patterns/index.html
19-
8+
If you need help using or developing Nextflow pipelines, the best place to ask questions is the [community forum](https://community.seqera.io/).

.github/ISSUE_TEMPLATE/new_feature.md

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,16 @@
11
---
22
name: New feature
3-
about: Submit a new feature proposal
3+
about: Propose a new feature or enhancement
44
---
55

66
## New feature
77

8-
Hi! Thanks for using Nextflow and submitting the proposal
9-
for a new feature or the enhancement of an existing functionality.
8+
(Hi! Thanks for using Nextflow and for proposing a new feature or enhancement. Please replace this text with a brief description of your proposal.)
109

11-
Please replace this text providing a short description of your
12-
proposal.
10+
## Use case
1311

14-
## Usage scenario
12+
(What's the main use case and deployment scenario addressed by this proposal)
1513

16-
(What's the main usage case and the deployment scenario addressed by this proposal)
17-
18-
## Suggest implementation
14+
## Suggested implementation
1915

2016
(Highlight the main building blocks of a possible implementation and/or related components)
21-
22-
Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,7 @@
1-
Hi! Thanks for contributing to Nextflow project.
1+
Hi! Thanks for contributing to Nextflow.
22

3-
When submitting a Pull Request please make sure to not include
4-
in the changeset any modification in these files:
5-
6-
* `nextflow`
7-
* `modules/nf-commons/src/main/nextflow/Const.groovy`
8-
9-
Also, please sign-off the DCO [1] to certify you are the author of the contribution
10-
and you adhere to Nextflow open source license [2] adding a `Signed-off-by` line to
11-
the contribution commit message. For more details check [3].
3+
When submitting a Pull Request, please sign-off the DCO [1] to certify that you are the author of the contribution and you adhere to Nextflow's open source license [2] by adding a `Signed-off-by` line to the contribution commit message. See [3] for more details.
124

135
1. https://developercertificate.org/
146
2. https://github.com/nextflow-io/nextflow/blob/master/COPYING
157
3. https://github.com/apps/dco
16-

.github/workflows/build.yml

Lines changed: 15 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -39,34 +39,20 @@ jobs:
3939
run: |
4040
if [ "${{ github.event_name }}" = "pull_request" ]; then
4141
echo "GitHub event=pull_request"
42-
COMMIT_SHA=${{ github.event.pull_request.head.sha }}
43-
COMMIT_MESSAGE=$(curl -s \
42+
COMMIT_SHA="${{ github.event.pull_request.head.sha }}"
43+
COMMIT_MESSAGE="$(curl -s \
4444
-H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
45-
https://api.github.com/repos/${{ github.repository }}/commits/$COMMIT_SHA | jq -r '.commit.message')
45+
https://api.github.com/repos/${{ github.repository }}/commits/$COMMIT_SHA | jq -r '.commit.message')"
4646
echo "Commit message=$COMMIT_MESSAGE" | head -n 1
4747
echo "commit_message=$COMMIT_MESSAGE" | head -n 1 >> $GITHUB_OUTPUT
4848
else
49-
echo "GitHub event=${{ github.event_name }}"
50-
echo "Commit message=${{ github.event.head_commit.message }}" | head -n 1
51-
echo "commit_message=${{ github.event.head_commit.message }}" | head -n 1 >> $GITHUB_OUTPUT
52-
fi
53-
54-
- name: Get changed files
55-
id: changed-files
56-
uses: tj-actions/changed-files@v43
57-
with:
58-
files_ignore: docs/**
59-
60-
- name: List all changed files
61-
env:
62-
ALL_CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
63-
run: |
64-
for file in ${ALL_CHANGED_FILES}; do
65-
echo "$file was changed"
66-
done
49+
echo "GitHub event=${{ github.event_name }}"
50+
COMMIT_MESSAGE="${{ github.event.head_commit.message }}"
51+
echo "Commit message=$COMMIT_MESSAGE" | head -n 1
52+
echo "commit_message=$COMMIT_MESSAGE" | head -n 1 >> $GITHUB_OUTPUT
53+
fi
6754
6855
- name: Setup env
69-
if: steps.changed-files.outputs.any_changed == 'true'
7056
run: |
7157
rm -f $HOME/.gitconfig;
7258
mkdir -p "$HOME/.nextflow";
@@ -75,7 +61,6 @@ jobs:
7561
NXF_GITHUB_ACCESS_TOKEN: ${{ secrets.NXF_GITHUB_ACCESS_TOKEN }}
7662

7763
- name: Setup Java ${{ matrix.java_version }}
78-
if: steps.changed-files.outputs.any_changed == 'true'
7964
uses: actions/setup-java@v4
8065
with:
8166
java-version: ${{matrix.java_version}}
@@ -84,11 +69,9 @@ jobs:
8469
cache: gradle
8570

8671
- name: Compile
87-
if: steps.changed-files.outputs.any_changed == 'true'
8872
run: make assemble
8973

9074
- name: Test
91-
if: steps.changed-files.outputs.any_changed == 'true'
9275
run: |
9376
env | sort
9477
# configure test env
@@ -113,26 +96,24 @@ jobs:
11396

11497
- name: Publish tests report
11598
uses: actions/upload-artifact@v4
116-
if: steps.changed-files.outputs.any_changed == 'true' && always()
11799
with:
118100
name: report-unit-tests-jdk-${{ matrix.java_version }}
119101
path: |
120102
**/build/reports/tests/test
121103
122104
outputs:
123-
any_changed: ${{ steps.changed-files.outputs.any_changed }}
124105
commit_message: ${{ steps.get_commit_message.outputs.commit_message }}
125106

126107
test:
127-
if: ${{ !contains(needs.build.outputs.commit_message, '[ci fast]') && needs.build.outputs.any_changed == 'true' }}
108+
if: ${{ !contains(needs.build.outputs.commit_message, '[ci fast]') }}
128109
needs: build
129110
runs-on: ubuntu-latest
130111
timeout-minutes: 90
131112
strategy:
132113
fail-fast: false
133114
matrix:
134115
java_version: [17, 23]
135-
test_mode: ["test_integration", "test_docs", "test_aws", "test_azure", "test_google", "test_wave"]
116+
test_mode: ["test_integration", "test_parser_v2", "test_docs", "test_aws", "test_azure", "test_google", "test_wave"]
136117
steps:
137118
- name: Checkout
138119
uses: actions/checkout@v4
@@ -187,17 +168,18 @@ jobs:
187168

188169
- name: Tar integration tests
189170
if: always()
190-
run: tar -cvf integration-tests.tar tests/checks
171+
run: |
172+
tar -cvf integration-tests.tar.gz tests/checks
173+
tar -cvf validation-tests.tar.gz validation
191174
192175
- name: Publish tests report
193176
uses: actions/upload-artifact@v4
194177
if: always()
195178
with:
196179
name: report-${{ matrix.test_mode }}-jdk-${{ matrix.java_version }}
197180
path: |
198-
validation/**/*
199-
validation/**/.*
200-
integration-tests.tar
181+
validation-tests.tar.gz
182+
integration-tests.tar.gz
201183
202184
test-e2e:
203185
if: ${{ contains(needs.build.outputs.commit_message,'[e2e stage]') || contains(needs.build.outputs.commit_message,'[e2e prod]') }}

.github/workflows/codespell.yml

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

Makefile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,16 @@ else
2727
mm =
2828
endif
2929

30+
compile:
31+
./gradlew compile exportClasspath
32+
@echo "DONE `date`"
33+
34+
assemble:
35+
./gradlew buildInfo compile assemble
36+
37+
check:
38+
./gradlew check
39+
3040
clean:
3141
rm -rf .nextflow*
3242
rm -rf work
@@ -38,21 +48,11 @@ clean:
3848
rm -rf plugins/*/build
3949
./gradlew clean
4050

41-
compile:
42-
./gradlew compile exportClasspath
43-
@echo "DONE `date`"
44-
45-
assemble:
46-
./gradlew buildInfo compile assemble
47-
48-
check:
49-
./gradlew check
50-
5151
#
5252
# install compiled artifacts in Maven local dir
5353
#
5454
install:
55-
BUILD_PACK=1 ./gradlew installLauncher publishToMavenLocal -Dmaven.repo.local=${HOME}/.nextflow/capsule/deps/
55+
BUILD_PACK=1 ./gradlew installLauncher publishToMavenLocal
5656

5757
#
5858
# Show dependencies try `make deps config=runtime`, `make deps config=google`

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
24.11.0-edge
1+
25.02.1-edge

build.gradle

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -67,18 +67,12 @@ allprojects {
6767
apply plugin: 'jacoco'
6868

6969
java {
70+
// these settings apply to all jvm tooling, including groovy
7071
toolchain {
7172
languageVersion = JavaLanguageVersion.of(21)
7273
}
73-
}
74-
75-
compileJava {
76-
options.release.set(17)
77-
}
78-
79-
tasks.withType(GroovyCompile) {
80-
sourceCompatibility = '17'
81-
targetCompatibility = '17'
74+
sourceCompatibility = 17
75+
targetCompatibility = 17
8276
}
8377

8478
idea {
@@ -109,8 +103,8 @@ allprojects {
109103

110104
// Documentation required libraries
111105
groovyDoc 'org.fusesource.jansi:jansi:2.4.0'
112-
groovyDoc "org.apache.groovy:groovy-groovydoc:4.0.24"
113-
groovyDoc "org.apache.groovy:groovy-ant:4.0.24"
106+
groovyDoc "org.apache.groovy:groovy-groovydoc:4.0.26"
107+
groovyDoc "org.apache.groovy:groovy-ant:4.0.26"
114108
}
115109

116110
test {
@@ -243,7 +237,7 @@ task compile {
243237

244238
def getRuntimeConfigs() {
245239
def names = subprojects
246-
.findAll { prj -> prj.name in ['nextflow','nf-commons','nf-httpfs'] }
240+
.findAll { prj -> prj.name in ['nextflow','nf-commons','nf-httpfs','nf-lang'] }
247241
.collect { it.name }
248242

249243
FileCollection result = null
@@ -269,7 +263,7 @@ task exportClasspath {
269263
def home = System.getProperty('user.home')
270264
def all = getRuntimeConfigs()
271265
def libs = all.collect { File file -> /*println file.canonicalPath.replace(home, '$HOME');*/ file.canonicalPath; }
272-
['nextflow','nf-commons','nf-httpfs'].each {libs << file("modules/$it/build/libs/${it}-${version}.jar").canonicalPath }
266+
['nextflow','nf-commons','nf-httpfs','nf-lang'].each {libs << file("modules/$it/build/libs/${it}-${version}.jar").canonicalPath }
273267
file('.launch.classpath').text = libs.unique().join(':')
274268
}
275269
}
@@ -282,7 +276,7 @@ ext.nexusEmail = project.findProperty('nexusEmail')
282276
// `signing.keyId` property needs to be defined in the `gradle.properties` file
283277
ext.enableSignArchives = project.findProperty('signing.keyId')
284278

285-
ext.coreProjects = projects( ':nextflow', ':nf-commons', ':nf-httpfs' )
279+
ext.coreProjects = projects( ':nextflow', ':nf-commons', ':nf-httpfs', ':nf-lang' )
286280

287281
configure(coreProjects) {
288282
group = 'io.nextflow'

0 commit comments

Comments
 (0)