Skip to content

Commit 2369624

Browse files
mhrvolmhrvol
committed
post-releaes update
1 parent c5e7c1b commit 2369624

File tree

8 files changed

+66
-60
lines changed

8 files changed

+66
-60
lines changed

‎.github/workflows/release.yml‎

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -97,59 +97,59 @@ jobs:
9797
dx login --noprojects --staging --token $ROBOT_TOKEN
9898
dx select $PROJECT
9999
cd ${GITHUB_WORKSPACE}
100-
# - name: Run unit tests
101-
# env:
102-
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
103-
# AUTH_TOKEN: ${{ secrets.DX_STAGING_TEST_ROBOT_TOKEN }}
104-
# SBT_OPTS: "-XX:+CMSClassUnloadingEnabled -Xmx4G -Xms1G"
105-
# run: |
106-
# sbt version && sbt compile && sbt "testOnly -- -l prod"
107-
# - name: Install dxcint
108-
# run: |
109-
# cd dxcint
110-
# poetry install
111-
# cd ..
112-
# - name: Run medium integration test suite with dxcint
113-
# env:
114-
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
115-
# ROBOT_TOKEN: ${{ secrets.DX_STAGING_ROBOT_TOKEN }}
116-
# run: |
117-
# cd dxcint
118-
# poetry run dxcint integration -t 'M' ../ --clean
119-
# - name: Run multi-user tests
120-
# env:
121-
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
122-
# ROBOT_TOKEN: ${{ secrets.DX_STAGING_ROBOT_TOKEN }}
123-
# TEST_ROBOT_TOKEN: ${{ secrets.DX_STAGING_TEST_ROBOT_TOKEN }}
124-
# run: |
125-
# FOLDER=/builds/test_gha_dxcompiler_$(date +%s)_$RANDOM
126-
# dx mkdir -p $FOLDER
127-
# python3 scripts/run_multiuser_tests.py --folder $FOLDER --project $PROJECT \
128-
# --alice-token $ROBOT_TOKEN \
129-
# --bob-token $TEST_ROBOT_TOKEN
130-
# - name: Run Docker image test
131-
# run:
132-
# ./scripts/docker_image/test.sh
133-
# - name: Run large and cromwell integration test suites with dxcint
134-
# if: ${{ github.event.inputs.should-run-tests == 'true' }}
135-
# env:
136-
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
137-
# ROBOT_TOKEN: ${{ secrets.DX_STAGING_ROBOT_TOKEN }}
138-
# run: |
139-
# cd dxcint
140-
# poetry run dxcint integration -t 'L' ../
141-
# poetry run dxcint integration -t 'CW' ../
142-
# - name: Run CWL conformance tests
143-
# if: ${{ github.event.inputs.should-run-tests == 'true' }}
144-
# env:
145-
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
146-
# ROBOT_TOKEN: ${{ secrets.DX_STAGING_ROBOT_TOKEN }}
147-
# run: |
148-
# export PATH="$PATH:$HOME/.local/bin"
149-
# FOLDER=/builds/test_gha_dxcompiler_$(date +%s)_$RANDOM
150-
# dx mkdir -p $FOLDER
151-
# python3 scripts/run_tests.py --folder $FOLDER --project $PROJECT \
152-
# --test CWL
100+
- name: Run unit tests
101+
env:
102+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
103+
AUTH_TOKEN: ${{ secrets.DX_STAGING_TEST_ROBOT_TOKEN }}
104+
SBT_OPTS: "-XX:+CMSClassUnloadingEnabled -Xmx4G -Xms1G"
105+
run: |
106+
sbt version && sbt compile && sbt "testOnly -- -l prod"
107+
- name: Install dxcint
108+
run: |
109+
cd dxcint
110+
poetry install
111+
cd ..
112+
- name: Run medium integration test suite with dxcint
113+
env:
114+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
115+
ROBOT_TOKEN: ${{ secrets.DX_STAGING_ROBOT_TOKEN }}
116+
run: |
117+
cd dxcint
118+
poetry run dxcint integration -t 'M' ../ --clean
119+
- name: Run multi-user tests
120+
env:
121+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
122+
ROBOT_TOKEN: ${{ secrets.DX_STAGING_ROBOT_TOKEN }}
123+
TEST_ROBOT_TOKEN: ${{ secrets.DX_STAGING_TEST_ROBOT_TOKEN }}
124+
run: |
125+
FOLDER=/builds/test_gha_dxcompiler_$(date +%s)_$RANDOM
126+
dx mkdir -p $FOLDER
127+
python3 scripts/run_multiuser_tests.py --folder $FOLDER --project $PROJECT \
128+
--alice-token $ROBOT_TOKEN \
129+
--bob-token $TEST_ROBOT_TOKEN
130+
- name: Run Docker image test
131+
run:
132+
./scripts/docker_image/test.sh
133+
- name: Run large and cromwell integration test suites with dxcint
134+
if: ${{ github.event.inputs.should-run-tests == 'true' }}
135+
env:
136+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
137+
ROBOT_TOKEN: ${{ secrets.DX_STAGING_ROBOT_TOKEN }}
138+
run: |
139+
cd dxcint
140+
poetry run dxcint integration -t 'L' ../
141+
poetry run dxcint integration -t 'CW' ../
142+
- name: Run CWL conformance tests
143+
if: ${{ github.event.inputs.should-run-tests == 'true' }}
144+
env:
145+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
146+
ROBOT_TOKEN: ${{ secrets.DX_STAGING_ROBOT_TOKEN }}
147+
run: |
148+
export PATH="$PATH:$HOME/.local/bin"
149+
FOLDER=/builds/test_gha_dxcompiler_$(date +%s)_$RANDOM
150+
dx mkdir -p $FOLDER
151+
python3 scripts/run_tests.py --folder $FOLDER --project $PROJECT \
152+
--test CWL
153153
- name: Run the release script
154154
env:
155155
DX_STAGING_RELEASE_TOKEN: ${{ secrets.DX_STAGING_ROBOT_TOKEN }}

‎RELEASE_NOTES.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Release Notes
22

3-
## 2.13.0 2025-03-18
3+
## Unreleased
4+
5+
## 2.13.0 2025-03-20
46

57
* Updated cwl_runner and dxcint (cwltool - 3.1.20250110105449, dxpy - 0.391.0, Python - >=3.10,<3.14, pyOpenSSL - 25.0.0, Schema-salad - 8.8.20250205075315)
68
* Updated GHA workflows (Ubuntu - 24.04, setuptools - 76.0.0, dxpy - 0.391.0, pyOpenSSL - 25.0.0) and added SBT installation

‎compiler/src/main/resources/application.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dxCompiler {
2-
version = "2.13.0"
2+
version = "2.13.1-SNAPSHOT"
33
}
44

55
#

‎core/src/main/resources/application.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dxCompilerCore {
2-
version = "2.13.0"
2+
version = "2.13.1-SNAPSHOT"
33
}
44

55
#

‎doc/Developing.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,10 @@ merge them into the release branch.
236236
Following the release, you need to merge `RELEASE_NOTES.md` from the release branch into develop. If you released from
237237
`HEAD`, then you also need to bump the SNAPSHOT versions in the `develop` branch using the `scripts/update_version.sh` script.
238238
239+
### Update workflow importer app
240+
241+
Update [workflow_importer](https://github.com/dnanexus/file-apps/tree/master/apps/workflow_importer) to the latest dxCompiler version.
242+
239243
### Creating draft release for testing
240244
241245
Follow the process above; just don't publish the draft release in the final step.
@@ -257,4 +261,4 @@ dx api project-xxxx invite '{"invitee": "PUBLIC", "level": "VIEW"}'
257261
updated (one line change).
258262
* The app used for copying the assets to different regions during a release ([app-dxwdl_copy](/scripts/dxcompiler_copy))
259263
needs to be enabled in the new region (please update `regionalOptions`, `whatsNew`, and increment the `version` of the app).
260-
* Update the script for [multi-region testing](/scripts/multi_region_tests.py#L24).
264+
* Update the script for [multi-region testing](/scripts/multi_region_tests.py#L24).

‎executorCommon/src/main/resources/application.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dxExecutorCommon {
2-
version = "2.13.0"
2+
version = "2.13.1-SNAPSHOT"
33
}
44

55
#

‎executorCwl/src/main/resources/application.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dxExecutorCwl {
2-
version = "2.13.0"
2+
version = "2.13.1-SNAPSHOT"
33
}
44

55
#

‎executorWdl/src/main/resources/application.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dxExecutorWdl {
2-
version = "2.13.0"
2+
version = "2.13.1-SNAPSHOT"
33
}
44

55
#

0 commit comments

Comments
 (0)