Skip to content

Commit

Permalink
second release candidate for version 1.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Jon Gadsden committed Dec 4, 2021
1 parent 50981a2 commit 5b30e97
Show file tree
Hide file tree
Showing 11 changed files with 23 additions and 18 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ as described in [setup-env.md](setup-env.md) and run the following from the root
- `docker run -it --rm -p 3000:3000 -v $(pwd)/.env:/app/.env owasp-threat-dragon:dev`

## Docker (from dockerhub)
Threat Dragon maintains a docker image on Dockerhub. Each release is tagged as `v{major}.{minor}.{patch}`, eg `v1.5.8`
Threat Dragon maintains a docker image on Dockerhub. Each release is tagged as `v{major}.{minor}.{patch}`, eg `v1.6.0`

### <ins>Do not use the latest tag (which is the default), as it could be a development release</ins>

Expand Down
13 changes: 9 additions & 4 deletions dev-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,18 +70,23 @@ The steps used during the release process
### Tag the release
1. `git clone [email protected]:OWASP/threat-dragon.git`
1. `cd threat-dragon`
1. update version declaration, eg `"version": "1.5.0",`, in `package.json`, `td.site/package.json` and `td.server/package.json`
1. update version declaration, eg `"version": "1.6.0",`, in
`package.json`,
`td.desktop/package.json`,
`td.site/package.json`
and `td.server/package.json`
1. rebuild the applications using the new semver
1. `npm install`
1. `npm run build`
1. `npm test`
1. `git commit -a -m"<some release message>"`
1. `git push`
1. tag the release with appropriate subver `git tag v1.5.0`
1. `git push origin v1.5.0`
1. tag the release with appropriate subver `git tag v1.6.0`
1. `git push origin v1.6.0`

### Publish docker image
1. once tagged the workflow pushes the docker image to docker hub
1. check using `docker pull threatdragon/owasp-threat-dragon:v1.5.0`
1. check using `docker pull threatdragon/owasp-threat-dragon:v1.6.0`

Test the releases as above; ideally on all of Windows, linux and MacOS

Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "threat-dragon",
"version": "1.6.0-RC1",
"version": "1.6.0",
"private": false,
"scripts": {
"start": "npm-run-all build start:server",
Expand Down
2 changes: 1 addition & 1 deletion setup-env.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ services:
# Always use a specific version tag, as "latest" may be a development build
# Alternatively, you can use the "stable" tag, as that will always
# be the latest released version
image: threatdragon/owasp-threat-dragon:v1.5.8
image: threatdragon/owasp-threat-dragon:v1.6.0
ports:
- 3000:3000
environment:
Expand Down
4 changes: 2 additions & 2 deletions td.desktop/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion td.desktop/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "threat-dragon-desktop",
"productName": "OWASP-Threat-Dragon",
"version": "1.5.8",
"version": "1.6.0",
"description": "OWASP Threat Dragon desktop version",
"main": "main.js",
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions td.server/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion td.server/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "threat-dragon-server",
"version": "1.6.0-RC1",
"version": "1.6.0",
"private": false,
"scripts": {
"start": "echo 'Please run the start command from the root of this repository' && exit 1",
Expand Down
4 changes: 2 additions & 2 deletions td.site/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion td.site/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "threat-dragon-site",
"version": "1.6.0-RC1",
"version": "1.6.0",
"private": false,
"scripts": {
"build": "npm-run-all clean build:css build:min build:fonts build:core bundle",
Expand Down

0 comments on commit 5b30e97

Please sign in to comment.