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.

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

APPS-2556 Post-release 2.11.6 #465

Merged
merged 7 commits into from
Mar 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## in develop

## 2.11.6 2024-03-26

* Optimize with bulk file describe during scatter collect, also for files inside arrays and structs.

### Dependency updates
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/main/resources/application.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dxCompiler {
version = "2.11.6-SNAPSHOT"
version = "2.11.7-SNAPSHOT"
}

#
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/application.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dxCompilerCore {
version = "2.11.6-SNAPSHOT"
version = "2.11.7-SNAPSHOT"
}

#
Expand Down
2 changes: 1 addition & 1 deletion executorCommon/src/main/resources/application.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dxExecutorCommon {
version = "2.11.6-SNAPSHOT"
version = "2.11.7-SNAPSHOT"
}

#
Expand Down
2 changes: 1 addition & 1 deletion executorCwl/src/main/resources/application.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dxExecutorCwl {
version = "2.11.6-SNAPSHOT"
version = "2.11.7-SNAPSHOT"
}

#
Expand Down
2 changes: 1 addition & 1 deletion executorWdl/src/main/resources/application.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dxExecutorWdl {
version = "2.11.6-SNAPSHOT"
version = "2.11.7-SNAPSHOT"
}

#
Expand Down
3 changes: 2 additions & 1 deletion scripts/run_customer_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ pwd
# Build, run test applet in each project
for p in ${TEST_PROJECTS[@]}; do
dx select $p
echo "Building and running test applet in $p"
echo 'Running customer acceptance tests in project'
dx describe $p --json | jq '.name'
dx build -f --run --priority normal -y
done
2 changes: 1 addition & 1 deletion test-dxcompiler-in-project/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# TODO: find a way to download from draft release URLs; the below works for final releases.
# For draft releases, save jar manually to resources/home/dnanexus/dxCompiler.jar
DXCOMPILER_JAR_URL=https://github.com/dnanexus/dxCompiler/releases/download/2.7.0/dxCompiler-2.7.0.jar
DXCOMPILER_JAR_URL=https://github.com/dnanexus/dxCompiler/releases/download/2.11.6/dxCompiler-2.11.6.jar

all: no-op

Expand Down
4 changes: 2 additions & 2 deletions test-dxcompiler-in-project/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Applet `test-dxcompiler-in-project` can be built and deployed in customer-provid

## Building & Running the Applet

- Run the dxCompiler release GitHub workflow; this uploads dxCompiler assets to the platform.
- Set the dxCompiler download URL in `test-dxcompiler-in-project/Makefile`.
- Run the dxCompiler release GitHub workflow; this uploads dxCompiler assets to the platform and creates a draft release on GitHub.
- For draft releases, download dxCompiler.jar from the [releases page](https://github.com/dnanexus/dxCompiler/releases) and save it as `test-dxcompiler-in-project/resources/home/dnanexus/dxCompiler.jar`.
- Run the script `scripts/run_customer_tests`.
- You will need to be a member of `org-dnanexus_apps_customer_testers` to access the projects.
Loading