Skip to content
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

Release 2.11.0 #151

Merged
merged 4 commits into from
Jan 22, 2021
Merged

Release 2.11.0 #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62104bb
next snapshot
andricDu Dec 1, 2020
489f610
Merge pull request #143 from icgc-argo/mb/2.11.0-SNAPSHOT
andricDu Dec 1, 2020
9ca2a83
update schema and mappings to latest WES spec + fix string/bool (#150)
lepsalex Jan 21, 2021
34c2a2a
release 2.11.0
lepsalex Jan 22, 2021
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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</parent>
<groupId>org.icgc.argo</groupId>
<artifactId>workflow-management</artifactId>
<version>2.10.0</version>
<version>2.11.0</version>
<name>workflow-management</name>
<description>ARGO Workflow Management</description>

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/icgc/argo/workflow_management/service/NextflowService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ private CmdKubeRun createCmd(@NonNull Launcher launcher, @NonNull RunParams para
// should pull latest code before running?
// does not prevent us running a specific version (revision),
// does enforce pulling of that branch/hash before running)
cmdParams.put("latest", workflowEngineParams.getLatest(), v -> parseBoolean((String) v));
cmdParams.put("latest", workflowEngineParams.getLatest());

// Process options (default docker container to run for process if not specified)
if (nonNull(workflowEngineParams.getDefaultContainer())) {
Expand Down
7 changes: 2 additions & 5 deletions src/main/java/org/icgc/argo/workflow_management/wes/controller/model/RunsRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,7 @@ public class RunsRequest {
private Map<String, Object> workflowParams = new HashMap<>();
private WorkflowEngineParams workflowEngineParams = new WorkflowEngineParams();

private Map<String, Object> workflowType;
private String[] workflowTypeVersion;
private String workflowType;
private String workflowTypeVersion;
private Map<String, Object> tags;

// we will not be accepting this (at least to start)
private String[] workflowAttachment;
}
2 changes: 1 addition & 1 deletion ...ain/java/org/icgc/argo/workflow_management/wes/controller/model/WorkflowEngineParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@ public class WorkflowEngineParams {
private String launchDir;
private String projectDir;
private String workDir;
private String latest;
private Boolean latest;
}
7 changes: 3 additions & 4 deletions src/main/resources/schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,16 @@ input WorkflowEngineParams {
launchDir: String
projectDir: String
workDir: String
latest: String
latest: Boolean
}

input RunsRequest {
workflowUrl: String!
workflowEngineParams: WorkflowEngineParams
workflowParams: JSON
workflowType: JSON
workflowTypeVersion: [String]
workflowType: String
workflowTypeVersion: String
tags: JSON
workflowAttachment: [String]
}


Expand Down