Skip to content

Commit 16aa5aa

Browse files
committed
release version 2.4.1
1 parent 2c13c15 commit 16aa5aa

File tree

7 files changed

+64
-64
lines changed

7 files changed

+64
-64
lines changed

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "threat-dragon",
3-
"version": "2.4.0",
3+
"version": "2.4.1",
44
"appBundleId": "org.owasp.threatdragon",
55
"private": true,
66
"scripts": {

release-process.md

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ For example if RC1, but change for RC2 and so on :
1010

1111
1. `git clone [email protected]:OWASP/threat-dragon.git`
1212
2. `cd threat-dragon`
13-
3. update version, for example `"version": "2.4.0-RC1",`, in `td.vue/package.json`
13+
3. update version, for example `"version": "2.4.1-RC1",`, in `td.vue/package.json`
1414
4. ensure `buildState` in `td.vue/package.json` is "" (empty)
15-
5. update version, for example `"version": "2.4.0-RC1",`, in `package.json` and `td.server/package.json`
15+
5. update version, for example `"version": "2.4.1-RC1",`, in `package.json` and `td.server/package.json`
1616
6. update package lock files: `npm install`
1717
7. `npm run build`
1818
8. `npm test`
1919
9. `npm run test:vue`
2020
10. ensure that the package-lock files are up to date using `npm install`
2121
11. `git add --all; git status`
22-
12. `git commit -m"release candidate 2.4.0-RC1"`
22+
12. `git commit -m"release candidate 2.4.1-RC1"`
2323
13. `git push`
24-
14. tag the release `git tag v2.4.0-RC1`
25-
15. `git push origin v2.4.0-RC1`
24+
14. tag the release `git tag v2.4.1-RC1`
25+
15. `git push origin v2.4.1-RC1`
2626

2727
repeat as necessary for further release candidates.
2828

@@ -50,18 +50,18 @@ After the releases candidate has been agreed by the Threat Dragon community, a r
5050

5151
1. `git clone [email protected]:OWASP/threat-dragon.git`
5252
2. `cd threat-dragon`
53-
3. update version eg `"version": "2.4.0",`, in `package.json`, `td.vue/package.json` and `td.server/package.json`
53+
3. update version eg `"version": "2.4.1",`, in `package.json`, `td.vue/package.json` and `td.server/package.json`
5454
4. update `buildState` in `td.vue/package.json` away from `-latest` to "" (empty)
5555
5. update package lock files: `npm install`
5656
6. `npm run build`
5757
7. `npm test`
5858
8. `npm run test:vue`
5959
9. ensure that the package-lock files are up to date using `npm install`
6060
10. `git add --all; git status`
61-
11. `git commit -m"release version 2.4.0"`
61+
11. `git commit -m"release version 2.4.1"`
6262
12. `git push`
63-
13. tag the release `git tag v2.4.0`
64-
14. `git push origin v2.4.0`
63+
13. tag the release `git tag v2.4.1`
64+
14. `git push origin v2.4.1`
6565

6666
The github release workflow then creates the draft release and the install images
6767

@@ -71,33 +71,33 @@ Ensure the tag now exists within the [Threat Dragon Docker hub][td-dock].
7171
Do this after logging into an active Docker account using `docker login` from the CLI and running Docker Desktop.
7272

7373
1. once tagged, the github workflow pushes the docker image to docker hub
74-
2. pull image for an X86 platform using `docker pull --platform linux/x86_64 threatdragon/owasp-threat-dragon:v2.4.0`
75-
3. pull image for an ARM platform using `docker pull --platform linux/arm64 threatdragon/owasp-threat-dragon:v2.4.0-arm64`
74+
2. pull image for an X86 platform using `docker pull --platform linux/x86_64 threatdragon/owasp-threat-dragon:v2.4.1`
75+
3. pull image for an ARM platform using `docker pull --platform linux/arm64 threatdragon/owasp-threat-dragon:v2.4.1-arm64`
7676
4. Test using the command to run a detached container:
77-
`docker run -d -p 8080:3000 -v $(pwd)/.env:/app/.env threatdragon/owasp-threat-dragon:v2.4.0`
77+
`docker run -d -p 8080:3000 -v $(pwd)/.env:/app/.env threatdragon/owasp-threat-dragon:v2.4.1`
7878
5. Test the ARM container as well:
79-
`docker run -d -p 8080:3000 -v $(pwd)/.env:/app/.env threatdragon/owasp-threat-dragon:v2.4.0-arm64`
79+
`docker run -d -p 8080:3000 -v $(pwd)/.env:/app/.env threatdragon/owasp-threat-dragon:v2.4.1-arm64`
8080
6. Ideally test these releases on Windows, linux and MacOS using `http://localhost:8080/#/`
8181

8282
If the image tests correctly, promote the docker image from dockerhub `threatdragon/`
83-
to dockerhub `OWASP/threat-dragon/v2.4.0` and `OWASP/threat-dragon/v2.4.0-arm64`.
83+
to dockerhub `OWASP/threat-dragon/v2.4.1` and `OWASP/threat-dragon/v2.4.1-arm64`.
8484

8585
There is _no going back_ on these steps, so they are deliberately left as manual tasks:
8686

8787
```text
88-
docker pull --platform linux/x86_64 threatdragon/owasp-threat-dragon:v2.4.0
89-
docker tag threatdragon/owasp-threat-dragon:v2.4.0 owasp/threat-dragon:v2.4.0
90-
docker push owasp/threat-dragon:v2.4.0
91-
docker pull owasp/threat-dragon:v2.4.0
88+
docker pull --platform linux/x86_64 threatdragon/owasp-threat-dragon:v2.4.1
89+
docker tag threatdragon/owasp-threat-dragon:v2.4.1 owasp/threat-dragon:v2.4.1
90+
docker push owasp/threat-dragon:v2.4.1
91+
docker pull owasp/threat-dragon:v2.4.1
9292
93-
docker tag owasp/threat-dragon:v2.4.0 owasp/threat-dragon:stable
93+
docker tag owasp/threat-dragon:v2.4.1 owasp/threat-dragon:stable
9494
docker push owasp/threat-dragon:stable
9595
docker pull owasp/threat-dragon:stable
9696
97-
docker pull --platform linux/arm64 threatdragon/owasp-threat-dragon:v2.4.0-arm64
98-
docker tag threatdragon/owasp-threat-dragon:v2.4.0-arm64 owasp/threat-dragon:v2.4.0-arm64
99-
docker push owasp/threat-dragon:v2.4.0-arm64
100-
docker pull owasp/threat-dragon:v2.4.0-arm64
97+
docker pull --platform linux/arm64 threatdragon/owasp-threat-dragon:v2.4.1-arm64
98+
docker tag threatdragon/owasp-threat-dragon:v2.4.1-arm64 owasp/threat-dragon:v2.4.1-arm64
99+
docker push owasp/threat-dragon:v2.4.1-arm64
100+
docker pull owasp/threat-dragon:v2.4.1-arm64
101101
```
102102

103103
ensure the tag now exists within the [OWASP Docker hub][owasp-dock].
@@ -111,14 +111,14 @@ ensure the tag now exists within the [OWASP Docker hub][owasp-dock].
111111

112112
### Checksum for Linux desktop AppImage
113113

114-
Download desktop AppImage for Linux `Threat-Dragon-ng-2.4.0.AppImage` and the `latest-linux.yml` auto-update checksum file.
114+
Download desktop AppImage for Linux `Threat-Dragon-ng-2.4.1.AppImage` and the `latest-linux.yml` auto-update checksum file.
115115

116116
Create SHA512 `checksum-linux.yml` file:
117117

118118
```bash
119119
grep sha512 latest-linux.yml | tail -n 1 | cut -d ":" -f 2 | base64 -d | \
120120
hexdump -ve '1/1 "%.2x"' > checksum-linux.yml
121-
echo -n " Threat-Dragon-ng-2.4.0.AppImage" >> checksum-linux.yml
121+
echo -n " Threat-Dragon-ng-2.4.1.AppImage" >> checksum-linux.yml
122122
```
123123

124124
Check correct using: `sha512sum --check checksum-linux.yml` and upload to release area
@@ -145,59 +145,59 @@ The secrets for both signing and notarization can be checked by running it manua
145145
- provide the [code signing certs for MacOS][certs]
146146
- Download both x86 and arm64 files for the MacOS installer (`*.dmg` and `*.zip`)
147147
- ensure that the apple developer [environment is set up][notarize]
148-
- notarize and staple the `Threat-Dragon-ng-2.x.x-arm64.dmg` file for arm64, using version 2.4.0 as an example:
148+
- notarize and staple the `Threat-Dragon-ng-2.x.x-arm64.dmg` file for arm64, using version 2.4.1 as an example:
149149
- `xcrun notarytool submit --apple-id <apple-account-email> --team-id <teamid> \`
150-
`--password <password> --verbose --wait Threat-Dragon-ng-2.4.0-arm64.dmg`
151-
- `xcrun stapler staple --verbose Threat-Dragon-ng-2.4.0-arm64.dmg`
150+
`--password <password> --verbose --wait Threat-Dragon-ng-2.4.1-arm64.dmg`
151+
- `xcrun stapler staple --verbose Threat-Dragon-ng-2.4.1-arm64.dmg`
152152
- similarly for the x86 image `Threat-Dragon-ng-2.x.x.dmg` :
153153
- `xcrun notarytool submit --apple-id <apple-account-email> --team-id <teamid> \`
154-
`--password <password> --verbose --wait Threat-Dragon-ng-2.4.0.dmg`
155-
- `xcrun stapler staple --verbose Threat-Dragon-ng-2.4.0.dmg`
156-
- notarize the application in both`.zip` files, for example using version 2.4.0:
154+
`--password <password> --verbose --wait Threat-Dragon-ng-2.4.1.dmg`
155+
- `xcrun stapler staple --verbose Threat-Dragon-ng-2.4.1.dmg`
156+
- notarize the application in both`.zip` files, for example using version 2.4.1:
157157
- `xcrun notarytool submit --apple-id <apple-account-email> --team-id <teamid> \`
158-
`--password <password> --verbose --wait Threat-Dragon-ng-2.4.0-arm64-mac.zip`
158+
`--password <password> --verbose --wait Threat-Dragon-ng-2.4.1-arm64-mac.zip`
159159
- unzip the file to obtain the application directory `Threat-Dragon-ng.app`
160160
- check notarization worked: `spctl -a -v Threat-Dragon-ng.app`
161161
- staple the application: `xcrun stapler staple --verbose Threat-Dragon-ng.app`
162162
- zip the application directory to get: `Threat-Dragon-ng.zip`
163-
- rename `Threat-Dragon-ng.zip` to update `Threat-Dragon-ng-2.4.0-arm64-mac.zip`
163+
- rename `Threat-Dragon-ng.zip` to update `Threat-Dragon-ng-2.4.1-arm64-mac.zip`
164164
- similarly for the x86 application `zip` file :
165165
- `xcrun notarytool submit --apple-id <apple-account-email> --team-id <teamid> \`
166-
`--password <password> --verbose --wait Threat-Dragon-ng-2.4.0-mac.zip`
166+
`--password <password> --verbose --wait Threat-Dragon-ng-2.4.1-mac.zip`
167167
- unzip the file to obtain the application directory `Threat-Dragon-ng.app`
168168
- check notarization worked: `spctl -a -v Threat-Dragon-ng.app`
169169
- staple the application: `xcrun stapler staple --verbose Threat-Dragon-ng.app`
170170
- zip the application directory to get: `Threat-Dragon-ng.zip`
171-
- rename `Threat-Dragon-ng.zip` to update `Threat-Dragon-ng-2.4.0-mac.zip`
171+
- rename `Threat-Dragon-ng.zip` to update `Threat-Dragon-ng-2.4.1-mac.zip`
172172

173173
Fix up the checksums in `latest-mac.yml` values using script:
174174

175175
```bash
176-
echo -n " - url: Threat-Dragon-ng-2.4.0-mac.zip\n sha512: "
177-
openssl dgst -binary -sha512 Threat-Dragon-ng-2.4.0-mac.zip | openssl base64 -A
176+
echo -n " - url: Threat-Dragon-ng-2.4.1-mac.zip\n sha512: "
177+
openssl dgst -binary -sha512 Threat-Dragon-ng-2.4.1-mac.zip | openssl base64 -A
178178
echo -n "\n size: "
179-
ls -l Threat-Dragon-ng-2.4.0-mac.zip | cut -d " " -f 7
179+
ls -l Threat-Dragon-ng-2.4.1-mac.zip | cut -d " " -f 7
180180

181-
echo -n "\n - url: Threat-Dragon-ng-2.4.0-arm64-mac.zip\n sha512: "
182-
openssl dgst -binary -sha512 Threat-Dragon-ng-2.4.0-arm64-mac.zip | openssl base64 -A
181+
echo -n "\n - url: Threat-Dragon-ng-2.4.1-arm64-mac.zip\n sha512: "
182+
openssl dgst -binary -sha512 Threat-Dragon-ng-2.4.1-arm64-mac.zip | openssl base64 -A
183183
echo -n "\n size: "
184-
ls -l Threat-Dragon-ng-2.4.0-arm64-mac.zip | cut -d " " -f 7
184+
ls -l Threat-Dragon-ng-2.4.1-arm64-mac.zip | cut -d " " -f 7
185185

186-
echo -n "\n - url: Threat-Dragon-ng-2.4.0.dmg\n sha512: "
187-
openssl dgst -binary -sha512 Threat-Dragon-ng-2.4.0.dmg | openssl base64 -A
186+
echo -n "\n - url: Threat-Dragon-ng-2.4.1.dmg\n sha512: "
187+
openssl dgst -binary -sha512 Threat-Dragon-ng-2.4.1.dmg | openssl base64 -A
188188
echo -n "\n size: "
189-
ls -l Threat-Dragon-ng-2.4.0.dmg | cut -d " " -f 7
189+
ls -l Threat-Dragon-ng-2.4.1.dmg | cut -d " " -f 7
190190

191-
echo -n "\n - url: Threat-Dragon-ng-2.4.0-arm64.dmg\n sha512: "
192-
openssl dgst -binary -sha512 Threat-Dragon-ng-2.4.0-arm64.dmg | openssl base64 -A
191+
echo -n "\n - url: Threat-Dragon-ng-2.4.1-arm64.dmg\n sha512: "
192+
openssl dgst -binary -sha512 Threat-Dragon-ng-2.4.1-arm64.dmg | openssl base64 -A
193193
echo -n "\n size: "
194-
ls -l Threat-Dragon-ng-2.4.0-arm64.dmg | cut -d " " -f 7
194+
ls -l Threat-Dragon-ng-2.4.1-arm64.dmg | cut -d " " -f 7
195195
```
196196

197197
Create the checksum files:
198198

199-
- `sha512sum Threat-Dragon-ng-2.4.0.dmg > checksum-mac.yml`
200-
- `sha512sum Threat-Dragon-ng-2.4.0-arm64.dmg > checksum-mac-arm64.yml`
199+
- `sha512sum Threat-Dragon-ng-2.4.1.dmg > checksum-mac.yml`
200+
- `sha512sum Threat-Dragon-ng-2.4.1-arm64.dmg > checksum-mac-arm64.yml`
201201

202202
Upload files into the new release.
203203
Note that the original files of the same name need to be removed first.
@@ -223,15 +223,15 @@ The latest certificate is provided using Certum's Open Source certificate:
223223
4. ensure Powershell has the `signtool` utility installed from Windows SDK
224224
5. right click the icon in the desktop tray to select ‘Connect to SimplySign’
225225
6. gain a thumbprint from desktop tray icon, Manage certificates → Certificate list → Details → Thumbprint
226-
7. `signtool sign /sha1 "<thumbprint>" /tr http://time.certum.pl /td sha256 /fd sha256 /v "Threat-Dragon-ng-Setup-2.4.0.exe" `
226+
7. `signtool sign /sha1 "<thumbprint>" /tr http://time.certum.pl /td sha256 /fd sha256 /v "Threat-Dragon-ng-Setup-2.4.1.exe" `
227227

228-
Once signed create the checksum file: `sha512sum Threat-Dragon-ng-Setup-2.4.0.exe > checksum.yml`
228+
Once signed create the checksum file: `sha512sum Threat-Dragon-ng-Setup-2.4.1.exe > checksum.yml`
229229

230230
Fix up the file `latest.yml` with the correct size and the SHA256 value given by:
231231

232-
- `openssl dgst -binary -sha512 Threat-Dragon-ng-Setup-2.4.0.exe | openssl base64 -A`
232+
- `openssl dgst -binary -sha512 Threat-Dragon-ng-Setup-2.4.1.exe | openssl base64 -A`
233233

234-
Upload files `Threat-Dragon-ng-Setup-2.4.0.exe`, `checksum.yml` and `latest.yml` into the new release.
234+
Upload files `Threat-Dragon-ng-Setup-2.4.1.exe`, `checksum.yml` and `latest.yml` into the new release.
235235
Note that the original files of the same name need to be removed first.
236236

237237
### Confirm desktop checksums
@@ -255,7 +255,7 @@ Edit the 'What's Changed' to filter out any chores.
255255

256256
Then update the release notes for the draft in the [Threat Dragon release area][area]
257257
using the release notes using markdown provided by `.release-note-template.md` as a template,
258-
making sure to revise `2.x.x` to the correct version number such as `2.4.0`
258+
making sure to revise `2.x.x` to the correct version number such as `2.4.1`
259259

260260
Once everything is in place promote the release from 'draft' to 'public' and 'latest'
261261

td.server/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

td.server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "threat-dragon-server",
3-
"version": "2.4.0",
3+
"version": "2.4.1",
44
"private": true,
55
"scripts": {
66
"audit": "npm audit",

td.vue/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

td.vue/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "threat-dragon",
33
"productName": "Threat Dragon",
4-
"version": "2.4.0",
4+
"version": "2.4.1",
55
"appBundleId": "org.owasp.threatdragon",
66
"private": true,
77
"scripts": {
@@ -44,7 +44,7 @@
4444
},
4545
"license": "Apache-2.0",
4646
"homepage": "https://owasp.org/www-project-threat-dragon/",
47-
"buildState": "-latest",
47+
"buildState": "",
4848
"repository": {
4949
"type": "git",
5050
"url": "git://github.com/OWASP/threat-dragon.git"

0 commit comments

Comments
 (0)