From 352fa99020d88c0b4a09517fe2c3ec65a82cc2d4 Mon Sep 17 00:00:00 2001 From: Yevhenii Kuznetsov Date: Mon, 29 Sep 2025 15:14:04 +0200 Subject: [PATCH 1/4] set release version 2.15.0 --- RELEASE_NOTES.md | 2 +- compiler/src/main/resources/application.conf | 2 +- core/src/main/resources/application.conf | 2 +- executorCommon/src/main/resources/application.conf | 2 +- executorCwl/src/main/resources/application.conf | 2 +- executorWdl/src/main/resources/application.conf | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 7cd5cd063..8d373fa18 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,6 +1,6 @@ # Release Notes -## Unreleased +## 2.15.0 2025-09-29 * Added support for new region in OCI Ashburn diff --git a/compiler/src/main/resources/application.conf b/compiler/src/main/resources/application.conf index e91e6e3b6..2dfcceaef 100644 --- a/compiler/src/main/resources/application.conf +++ b/compiler/src/main/resources/application.conf @@ -1,5 +1,5 @@ dxCompiler { - version = "2.14.1-SNAPSHOT" + version = "2.15.0" } # diff --git a/core/src/main/resources/application.conf b/core/src/main/resources/application.conf index 146a48910..750ef39ae 100644 --- a/core/src/main/resources/application.conf +++ b/core/src/main/resources/application.conf @@ -1,5 +1,5 @@ dxCompilerCore { - version = "2.14.1-SNAPSHOT" + version = "2.15.0" } # diff --git a/executorCommon/src/main/resources/application.conf b/executorCommon/src/main/resources/application.conf index 748fe6fe9..ae59304d5 100644 --- a/executorCommon/src/main/resources/application.conf +++ b/executorCommon/src/main/resources/application.conf @@ -1,5 +1,5 @@ dxExecutorCommon { - version = "2.14.1-SNAPSHOT" + version = "2.15.0" } # diff --git a/executorCwl/src/main/resources/application.conf b/executorCwl/src/main/resources/application.conf index ec53c0ec7..218db3e9c 100644 --- a/executorCwl/src/main/resources/application.conf +++ b/executorCwl/src/main/resources/application.conf @@ -1,5 +1,5 @@ dxExecutorCwl { - version = "2.14.1-SNAPSHOT" + version = "2.15.0" } # diff --git a/executorWdl/src/main/resources/application.conf b/executorWdl/src/main/resources/application.conf index c73e0b3a4..111cd2fcd 100644 --- a/executorWdl/src/main/resources/application.conf +++ b/executorWdl/src/main/resources/application.conf @@ -1,5 +1,5 @@ dxExecutorWdl { - version = "2.14.1-SNAPSHOT" + version = "2.15.0" } # From e71522ebf997ff0dd2af3a131a72b4f863a516a7 Mon Sep 17 00:00:00 2001 From: Yevhenii Kuznetsov Date: Tue, 30 Sep 2025 13:45:57 +0200 Subject: [PATCH 2/4] Change dx compiler copy app env to newer Ubuntu 24.04 --- scripts/dxcompiler_copy/dxapp.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/dxcompiler_copy/dxapp.json b/scripts/dxcompiler_copy/dxapp.json index aea7d4788..0d04513b3 100644 --- a/scripts/dxcompiler_copy/dxapp.json +++ b/scripts/dxcompiler_copy/dxapp.json @@ -3,7 +3,7 @@ "title": "Copy File", "summary": "Copy a file to a different region", "dxapi": "1.0.0", - "version": "0.1.0", + "version": "0.2.0", "billTo": "org-dnanexus_apps", "developers": [ "org-dnanexus_apps" @@ -46,7 +46,7 @@ } }, "distribution": "Ubuntu", - "release": "20.04", + "release": "24.04", "version": "0", "file": "code.sh" }, @@ -123,7 +123,7 @@ } }, "details": { - "whatsNew": "* 0.1.0: Added new OCI Ashburn region \n * 0.0.7: Fixed instance types for Azure regions\n * 0.0.6: Added new Bahrain AWS region aws:me-south-1\n * 0.0.5: updated azure instances to v2 for OFH region\n * 0.0.3: Added new London OFH region\n * 0.0.2: Added new London region." + "whatsNew": "* 0.2.0: Update running environment to Ubuntu 24.04 \n * 0.1.0: Added new OCI Ashburn region \n * 0.0.7: Fixed instance types for Azure regions\n * 0.0.6: Added new Bahrain AWS region aws:me-south-1\n * 0.0.5: updated azure instances to v2 for OFH region\n * 0.0.3: Added new London OFH region\n * 0.0.2: Added new London region." }, "access": { "network": [ From e526bac660af3f7c12074ae9094eb9d8e222fbe6 Mon Sep 17 00:00:00 2001 From: Yevhenii Kuznetsov Date: Fri, 3 Oct 2025 14:38:56 +0200 Subject: [PATCH 3/4] Fix dxApi version to support OCI Ashburn --- RELEASE_NOTES.md | 4 ++++ build.sbt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 8d373fa18..dbeeb5fa1 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -4,6 +4,10 @@ * Added support for new region in OCI Ashburn +### Dependency updates + +* dxApi [0.13.14](https://github.com/dnanexus/dxScala/releases/tag/api-0.13.14) + ## 2.14.0 2025-07-03 * Added option `-executableCreationParallelism `, the maximum number of platform executables that dxCompiler can diff --git a/build.sbt b/build.sbt index ac375cb9a..0e3d5f843 100644 --- a/build.sbt +++ b/build.sbt @@ -126,7 +126,7 @@ val githubDxCompilerResolver = Resolver.githubPackages("dnanexus", "dxCompiler") lazy val dependencies = new { val dxCommonVersion = "0.11.5" - val dxApiVersion = "0.13.13" + val dxApiVersion = "0.13.14" val dxFileAccessProtocolsVersion = "0.5.6" val dxYamlVersion = "0.1.1" val cwlScalaVersion = "0.8.5" From 00c8f375c679cf9ff9197d4d0c06d264fcc6319d Mon Sep 17 00:00:00 2001 From: Yevhenii Kuznetsov Date: Mon, 6 Oct 2025 13:26:45 +0200 Subject: [PATCH 4/4] Cleanup after release --- RELEASE_NOTES.md | 2 ++ compiler/src/main/resources/application.conf | 2 +- core/src/main/resources/application.conf | 2 +- executorCommon/src/main/resources/application.conf | 2 +- executorCwl/src/main/resources/application.conf | 2 +- executorWdl/src/main/resources/application.conf | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index dbeeb5fa1..a9e4ddd46 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,5 +1,7 @@ # Release Notes +## Unreleased + ## 2.15.0 2025-09-29 * Added support for new region in OCI Ashburn diff --git a/compiler/src/main/resources/application.conf b/compiler/src/main/resources/application.conf index 2dfcceaef..7f18527b1 100644 --- a/compiler/src/main/resources/application.conf +++ b/compiler/src/main/resources/application.conf @@ -1,5 +1,5 @@ dxCompiler { - version = "2.15.0" + version = "2.15.1-SNAPSHOT" } # diff --git a/core/src/main/resources/application.conf b/core/src/main/resources/application.conf index 750ef39ae..338715b70 100644 --- a/core/src/main/resources/application.conf +++ b/core/src/main/resources/application.conf @@ -1,5 +1,5 @@ dxCompilerCore { - version = "2.15.0" + version = "2.15.1-SNAPSHOT" } # diff --git a/executorCommon/src/main/resources/application.conf b/executorCommon/src/main/resources/application.conf index ae59304d5..ab78fb679 100644 --- a/executorCommon/src/main/resources/application.conf +++ b/executorCommon/src/main/resources/application.conf @@ -1,5 +1,5 @@ dxExecutorCommon { - version = "2.15.0" + version = "2.15.1-SNAPSHOT" } # diff --git a/executorCwl/src/main/resources/application.conf b/executorCwl/src/main/resources/application.conf index 218db3e9c..c9d7fe1a0 100644 --- a/executorCwl/src/main/resources/application.conf +++ b/executorCwl/src/main/resources/application.conf @@ -1,5 +1,5 @@ dxExecutorCwl { - version = "2.15.0" + version = "2.15.1-SNAPSHOT" } # diff --git a/executorWdl/src/main/resources/application.conf b/executorWdl/src/main/resources/application.conf index 111cd2fcd..b59de2431 100644 --- a/executorWdl/src/main/resources/application.conf +++ b/executorWdl/src/main/resources/application.conf @@ -1,5 +1,5 @@ dxExecutorWdl { - version = "2.15.0" + version = "2.15.1-SNAPSHOT" } #