@@ -10,19 +10,19 @@ For example if RC1, but change for RC2 and so on :
10
10
11
11
1 . ` git clone [email protected] :OWASP/threat-dragon.git `
12
12
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 `
14
14
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 `
16
16
6 . update package lock files: ` npm install `
17
17
7 . ` npm run build `
18
18
8 . ` npm test `
19
19
9 . ` npm run test:vue `
20
20
10 . ensure that the package-lock files are up to date using ` npm install `
21
21
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" `
23
23
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 `
26
26
27
27
repeat as necessary for further release candidates.
28
28
@@ -50,18 +50,18 @@ After the releases candidate has been agreed by the Threat Dragon community, a r
50
50
51
51
1 . ` git clone [email protected] :OWASP/threat-dragon.git `
52
52
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 `
54
54
4 . update ` buildState ` in ` td.vue/package.json ` away from ` -latest ` to "" (empty)
55
55
5 . update package lock files: ` npm install `
56
56
6 . ` npm run build `
57
57
7 . ` npm test `
58
58
8 . ` npm run test:vue `
59
59
9 . ensure that the package-lock files are up to date using ` npm install `
60
60
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 " `
62
62
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 `
65
65
66
66
The github release workflow then creates the draft release and the install images
67
67
@@ -71,33 +71,33 @@ Ensure the tag now exists within the [Threat Dragon Docker hub][td-dock].
71
71
Do this after logging into an active Docker account using ` docker login ` from the CLI and running Docker Desktop.
72
72
73
73
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 `
76
76
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 `
78
78
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 `
80
80
6 . Ideally test these releases on Windows, linux and MacOS using ` http://localhost:8080/#/ `
81
81
82
82
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 ` .
84
84
85
85
There is _ no going back_ on these steps, so they are deliberately left as manual tasks:
86
86
87
87
``` 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
92
92
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
94
94
docker push owasp/threat-dragon:stable
95
95
docker pull owasp/threat-dragon:stable
96
96
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
101
101
```
102
102
103
103
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].
111
111
112
112
### Checksum for Linux desktop AppImage
113
113
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.
115
115
116
116
Create SHA512 ` checksum-linux.yml ` file:
117
117
118
118
``` bash
119
119
grep sha512 latest-linux.yml | tail -n 1 | cut -d " :" -f 2 | base64 -d | \
120
120
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
122
122
```
123
123
124
124
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
145
145
- provide the [ code signing certs for MacOS] [ certs ]
146
146
- Download both x86 and arm64 files for the MacOS installer (` *.dmg ` and ` *.zip ` )
147
147
- 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:
149
149
- ` 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 `
152
152
- similarly for the x86 image ` Threat-Dragon-ng-2.x.x.dmg ` :
153
153
- ` 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 :
157
157
- ` 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 `
159
159
- unzip the file to obtain the application directory ` Threat-Dragon-ng.app `
160
160
- check notarization worked: ` spctl -a -v Threat-Dragon-ng.app `
161
161
- staple the application: ` xcrun stapler staple --verbose Threat-Dragon-ng.app `
162
162
- 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 `
164
164
- similarly for the x86 application ` zip ` file :
165
165
- ` 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 `
167
167
- unzip the file to obtain the application directory ` Threat-Dragon-ng.app `
168
168
- check notarization worked: ` spctl -a -v Threat-Dragon-ng.app `
169
169
- staple the application: ` xcrun stapler staple --verbose Threat-Dragon-ng.app `
170
170
- 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 `
172
172
173
173
Fix up the checksums in ` latest-mac.yml ` values using script:
174
174
175
175
``` 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
178
178
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
180
180
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
183
183
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
185
185
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
188
188
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
190
190
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
193
193
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
195
195
```
196
196
197
197
Create the checksum files:
198
198
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 `
201
201
202
202
Upload files into the new release.
203
203
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:
223
223
4 . ensure Powershell has the ` signtool ` utility installed from Windows SDK
224
224
5 . right click the icon in the desktop tray to select ‘Connect to SimplySign’
225
225
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" `
227
227
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 `
229
229
230
230
Fix up the file ` latest.yml ` with the correct size and the SHA256 value given by:
231
231
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 `
233
233
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.
235
235
Note that the original files of the same name need to be removed first.
236
236
237
237
### Confirm desktop checksums
@@ -255,7 +255,7 @@ Edit the 'What's Changed' to filter out any chores.
255
255
256
256
Then update the release notes for the draft in the [ Threat Dragon release area] [ area ]
257
257
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 `
259
259
260
260
Once everything is in place promote the release from 'draft' to 'public' and 'latest'
261
261
0 commit comments