From 9e3f64c029e5eca4eeb9715238c44434badab3d1 Mon Sep 17 00:00:00 2001 From: jon gadsden Date: Tue, 9 Jan 2024 09:47:20 +0000 Subject: [PATCH] release version 2.1.3 --- package-lock.json | 4 ++-- package.json | 2 +- release-process.md | 32 ++++++++++++++++---------------- td.server/package-lock.json | 4 ++-- td.server/package.json | 2 +- td.vue/package-lock.json | 4 ++-- td.vue/package.json | 4 ++-- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8655bd2f8..3b9390203 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "threat-dragon", - "version": "2.1.2", + "version": "2.1.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "threat-dragon", - "version": "2.1.2", + "version": "2.1.3", "hasInstallScript": true, "license": "Apache-2.0", "devDependencies": { diff --git a/package.json b/package.json index 61fa1ff95..99bee8a26 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "threat-dragon", - "version": "2.1.2", + "version": "2.1.3", "private": true, "scripts": { "audit": "npm-run-all -c audit:server audit:site", diff --git a/release-process.md b/release-process.md index 3f718f81a..1bdf3fab7 100644 --- a/release-process.md +++ b/release-process.md @@ -4,40 +4,40 @@ The steps used during the release process 1. `git clone git@github.com:OWASP/threat-dragon.git` 2. `cd threat-dragon` -3. update version eg `"version": "2.1.2",`, in `package.json`, `td.site/package.json` and `td.server/package.json` +3. update version eg `"version": "2.1.3",`, in `package.json`, `td.site/package.json` and `td.server/package.json` 4. update `buildState` in `td.vue/package.json` away from `-demo`, usually '' 5. `npm install` 6. `npm run build` 7. `npm test` 8. `npm run test:vue` 9. `git add --all; git status` -10. `git commit -m"release version 2.1.2"` +10. `git commit -m"release version 2.1.3"` 11. `git push` -12. tag the release `git tag v2.1.2` -13. `git push origin v2.1.2` +12. tag the release `git tag v2.1.3` +13. `git push origin v2.1.3` 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.1.2` +2. check using `docker pull threatdragon/owasp-threat-dragon:v2.1.3` 3. on MacOS M1 this command may need to be used: - `docker pull --platform linux/x86_64 threatdragon/owasp-threat-dragon:v2.1.2` + `docker pull --platform linux/x86_64 threatdragon/owasp-threat-dragon:v2.1.3` 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.1.2` + `docker run -d -p 8080:3000 -v $(pwd)/.env:/app/.env threatdragon/owasp-threat-dragon:v2.1.3` 5. Ideally test this release on Windows, linux and MacOS using `http://localhost:8080/#/` If the image tests correctly, promote the docker image -from dockerhub `threatdragon/` to dockerhub `OWASP/threat-dragon/v2.1.2`. +from dockerhub `threatdragon/` to dockerhub `OWASP/threat-dragon/v2.1.3`. There is _no going back_ on this last step, so it is deliberately left as a manual task: ```text -docker pull --platform linux/x86_64 threatdragon/owasp-threat-dragon:v2.1.2 -docker tag threatdragon/owasp-threat-dragon:v2.1.2 owasp/threat-dragon:v2.1.2 -docker push owasp/threat-dragon:v2.1.2 -docker pull owasp/threat-dragon:v2.1.2 +docker pull --platform linux/x86_64 threatdragon/owasp-threat-dragon:v2.1.3 +docker tag threatdragon/owasp-threat-dragon:v2.1.3 owasp/threat-dragon:v2.1.3 +docker push owasp/threat-dragon:v2.1.3 +docker pull owasp/threat-dragon:v2.1.3 ``` ensure the tag now exists within the OWASP Docker hub: `https://hub.docker.com/r/owasp/threat-dragon/tags` @@ -51,9 +51,9 @@ ensure the tag now exists within the OWASP Docker hub: `https://hub.docker.com/r 3.2 `grep sha512 latest-mac.yml | head -n 2 | tail -n 1 | cut -d ":" -f 2 | base64 -d | hexdump -ve '1/1 "%.2x"' >> checksum-mac.yml` 3.3 `grep sha512 latest.yml | head -n 2 | tail -n 1 | cut -d ":" -f 2 | base64 -d | hexdump -ve '1/1 "%.2x"' >> checksum.yml` 4. Confirm SHA512 with: - 4.1 `sha512sum Threat-Dragon-ng-2.1.1.AppImage` - 4.2 `sha512sum Threat-Dragon-ng-2.1.1.dmg` - 4.3 `sha512sum Threat-Dragon-ng-Setup-2.1.1.exe` + 4.1 `sha512sum Threat-Dragon-ng-2.1.3.AppImage` + 4.2 `sha512sum Threat-Dragon-ng-2.1.3.dmg` + 4.3 `sha512sum Threat-Dragon-ng-Setup-2.1.3.exe` 5. upload `checksum*.yml` files ### Check demo site @@ -67,7 +67,7 @@ ensure the tag now exists within the OWASP Docker hub: `https://hub.docker.com/r Update the release notes for the draft in the [Threat Dragon release area][area] using the release notes using markdown provided by `.release-note-template.md` as a template, -making sure to revise `2.x.x` to the correct version number such as `2.1.2` +making sure to revise `2.x.x` to the correct version number such as `2.1.3` Promote the release from draft to public once everything is in place diff --git a/td.server/package-lock.json b/td.server/package-lock.json index b58336470..d3a452259 100644 --- a/td.server/package-lock.json +++ b/td.server/package-lock.json @@ -1,12 +1,12 @@ { "name": "threat-dragon-server", - "version": "2.1.2", + "version": "2.1.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "threat-dragon-server", - "version": "2.1.2", + "version": "2.1.3", "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.21.0", diff --git a/td.server/package.json b/td.server/package.json index 484d12f2d..e73ce8d13 100644 --- a/td.server/package.json +++ b/td.server/package.json @@ -1,6 +1,6 @@ { "name": "threat-dragon-server", - "version": "2.1.2", + "version": "2.1.3", "private": true, "scripts": { "audit": "npm audit", diff --git a/td.vue/package-lock.json b/td.vue/package-lock.json index 110e2e942..2382d6530 100644 --- a/td.vue/package-lock.json +++ b/td.vue/package-lock.json @@ -1,12 +1,12 @@ { "name": "threat-dragon", - "version": "2.1.2", + "version": "2.1.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "threat-dragon", - "version": "2.1.2", + "version": "2.1.3", "license": "Apache-2.0", "dependencies": { "@antv/x6": "^1.34.14", diff --git a/td.vue/package.json b/td.vue/package.json index c0ea86990..aa72be8e3 100644 --- a/td.vue/package.json +++ b/td.vue/package.json @@ -1,7 +1,7 @@ { "name": "threat-dragon", "productName": "Threat Dragon", - "version": "2.1.2", + "version": "2.1.3", "private": true, "scripts": { "audit": "npm audit", @@ -38,7 +38,7 @@ }, "license": "Apache-2.0", "homepage": "https://owasp.org/www-project-threat-dragon/", - "buildState": "-latest", + "buildState": "", "repository": { "type": "git", "url": "git://github.com/OWASP/threat-dragon.git"