From b0a5671c78ac8d35b329412f9fef44c006d10b13 Mon Sep 17 00:00:00 2001 From: jon gadsden Date: Sun, 30 Apr 2023 05:46:08 +0100 Subject: [PATCH] release version 2.0.2 --- package.json | 2 +- release-process.md | 42 +++++++++++++++++++++++------------------- td.server/package.json | 2 +- td.vue/package.json | 4 ++-- 4 files changed, 27 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index 9235e7a10..d3baccc05 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "threat-dragon", - "version": "2.0.1", + "version": "2.0.2", "private": true, "scripts": { "build": "npm-run-all build:vue build:server", diff --git a/release-process.md b/release-process.md index 547e30837..e361424fe 100644 --- a/release-process.md +++ b/release-process.md @@ -3,36 +3,40 @@ The steps used during the release process ## Tag the release 1. `git clone git@github.com:OWASP/threat-dragon.git` 2. `cd threat-dragon` -3. update version declaration, eg `"version": "2.0.0",`, in `package.json`, `td.site/package.json` and `td.server/package.json` -4. `npm install` -5. `npm run build` -6. `npm test` -7. `git commit -a -m""` -8. `git push` -9. tag the release with appropriate subver `git tag v2.0.0` -10. `git push origin v2.0.0` +3. update version declaration, eg `"version": "2.0.2",`, in `package.json`, `td.site/package.json` and `td.server/package.json` +4. update build state in `td.server/package.json` +5. `pnpm install` +6. `npm run build` +7. `npm test` +8. `npm run test:vue` +9. add all changes `git add --all` +10. `git commit -a -m"release version 2.0.2"` +11. `git push` +12. tag the release `git tag v2.0.2` +13. `git push origin v2.0.2` -The github release workflow then creates the draft release and creates all the install images +The github release workflow then creates the draft release and the install images ### Publish docker image 1. once tagged, the github workflow pushes the docker image to docker hub -2. check using `docker pull threatdragon/owasp-threat-dragon:v2.0.0` -3. on MacOS M1 this command may need to be used `docker pull --platform linux/x86_64 threatdragon/owasp-threat-dragon:v2.0.0` -4. Test this release; ideally on Windows, linux and MacOS +2. check using `docker pull threatdragon/owasp-threat-dragon:v2.0.2` +3. on MacOS M1 this command may need to be used `docker pull --platform linux/x86_64 threatdragon/owasp-threat-dragon:v2.0.2` +4. Test using the command to run a detached container: `docker run -d -p 8080:3000 -v $(pwd)/.env:/app/.env threatdragon/owasp-threat-dragon:v2.0.2` +5. Ideally test this release on Windows, linux and MacOS + +If the image tests correctly, promote the docker image from dockerhub `threatdragon/` to dockerhub `OWASP/threat-dragon/v2.0.2`. -If the image tests corrrectly, promote the docker image from dockerhub `threatdragon/` -to dockerhub `OWASP/threat-dragon/v2.0.0`. There is _no going back_ on this last step, so it is deliberately left as a manual task: ``` -docker pull threatdragon/owasp-threat-dragon:v2.0.0 -docker tag threatdragon/owasp-threat-dragon:v2.0.0 owasp/threat-dragon:v2.0.0 -docker push owasp/threat-dragon:v2.0.0 +docker pull --platform linux/x86_64 threatdragon/owasp-threat-dragon:v2.0.2 +docker tag threatdragon/owasp-threat-dragon:v2.0.2 owasp/threat-dragon:v2.0.2 +docker push owasp/threat-dragon:v2.0.2 ``` ### Update release notes -All going well then update the release notes for the draft in the -[Threat Dragon release area](https://github.com/OWASP/threat-dragon/releases) and make public +Update the release notes for the draft in the +[Threat Dragon release area](https://github.com/OWASP/threat-dragon/releases) and promote the release from draft to public ### Announce Finally ensure Threat Dragon announces the new release, for example on the OWASP slack channels diff --git a/td.server/package.json b/td.server/package.json index 2da967ab3..aa25e95fa 100644 --- a/td.server/package.json +++ b/td.server/package.json @@ -1,6 +1,6 @@ { "name": "threat-dragon-server", - "version": "2.0.1", + "version": "2.0.2", "private": true, "scripts": { "build": "npm-run-all clean:dist transpile", diff --git a/td.vue/package.json b/td.vue/package.json index 5299735f8..2da2c0561 100644 --- a/td.vue/package.json +++ b/td.vue/package.json @@ -1,7 +1,7 @@ { "name": "threat-dragon", "productName": "Threat Dragon", - "version": "2.0.1", + "version": "2.0.2", "private": true, "scripts": { "build": "vue-cli-service build --no-unsafe-inline", @@ -38,7 +38,7 @@ }, "license": "Apache-2.0", "homepage": "https://owasp.org/www-project-threat-dragon/", - "buildState": "-demo", + "buildState": "", "repository": { "type": "git", "url": "git://github.com/OWASP/threat-dragon.git"