Skip to content

Fix false error for executor.jobName config option #6375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fix false error for executor.jobName config option #6375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions modules/nf-lang/src/main/java/nextflow/config/control/VariableScopeVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,8 @@ public void visitConfigAssign(ConfigAssignNode node) {
var scopes = currentConfigScopes();
inProcess = !scopes.isEmpty() && "process".equals(scopes.get(0));
inClosure = node.value instanceof ClosureExpression;
if( inClosure ) {
if( isWorkflowHandler(scopes, node) )
vsc.addWarning("The use of workflow handlers in the config is deprecated -- use the entry workflow or a plugin instead", String.join(".", node.names), node);
else if( !inProcess )
vsc.addError("Dynamic config options are only allowed in the `process` scope", node);
}
if( isWorkflowHandler(scopes, node) )
vsc.addWarning("The use of workflow handlers in the config is deprecated -- use the entry workflow or a plugin instead", String.join(".", node.names), node);
if( inClosure ) {
vsc.pushScope(ScriptDsl.class);
if( inProcess )
Expand Down
23 changes: 0 additions & 23 deletions modules/nf-lang/src/test/groovy/nextflow/config/control/ConfigResolveTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,29 +63,6 @@ class ConfigResolveTest extends Specification {
errors[0].getOriginalMessage() == '`process` is not defined'
}

def 'should report an error for an invalid dynamic config option' () {
when:
def errors = check(
'''\
report.file = { "report.html" }
'''
)
then:
errors.size() == 1
errors[0].getStartLine() == 1
errors[0].getStartColumn() == 1
errors[0].getOriginalMessage() == 'Dynamic config options are only allowed in the `process` scope'

when:
errors = check(
'''\
process.clusterOptions = { "--cpus ${task.cpus}" }
'''
)
then:
errors.size() == 0
}

def 'should report an error for an invalid config include' () {
given:
def root = tempDir()
Expand Down