Skip to content

Commit

Permalink
Release 2020.1.1: document updates
Browse files Browse the repository at this point in the history
  • Loading branch information
robyww committed Mar 25, 2020
1 parent cda5452 commit 2921f32
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
4 changes: 2 additions & 2 deletions config/app.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// adjustable application runtime properties
//---------------------------------------------
BuildMajor = 2020
BuildMinor = -1
BuildRev = 0
BuildMinor = 1
BuildRev = 1
BuildNumber = 0
BuildType = "Final"

Expand Down
10 changes: 6 additions & 4 deletions docs/new-release-procedure.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@


1. **Commit, Tag**
- commit you changest
- commit you changes - _example message:_ "Release 2020.1.0: document updates"
- tag the `rc-yyyy.m` branch with the release `release-yyyy.m.r`
- _example:_ the second release from branch `rc-2020.2` with the git tagged with `release-2020.2.1`


1. **Push to GitHub**:
- push the rc: _example:_ `git push origin rc-2020.1`
- push the tags: `git push origin --tags`
Expand All @@ -46,11 +47,11 @@
1. **Edit docker hub instructions**
- Go the the Firefly page on docker hub. https://cloud.docker.com/u/ipac/repository/docker/ipac/firefly
- Edit the markdown to include the recent tags


1. **Publish a new release on Github.**
- The text should use the [release-page-template.md](release-page-template.md)
- After using the template, copy the most markdown (for this release only) from the release-notes.md
- After using the template, copy the markdown (for this release only) from the release-notes.md
- paste markdown at the end of the template

1. **Merge RR, Reset the Version in config to development, Push dev**
- merge rc into dev
Expand All @@ -60,5 +61,6 @@
- `BuildMinor = -1`
- `BuildRev = 0`
- add any improvements to this file
- commit and push dev
- commit and push dev, _example message_ - "Post 2020.1 release: dev clean up"
``

7 changes: 6 additions & 1 deletion docs/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ See Firefly docker guidelines [here](firefly-docker.md).
##### _Docker tags, releases and patches_

- 2020.1 latest - `release-2020.1`
- 2020.1.0 - `release-2020.1.1` - original release
- 2020.1.0 - `release-2020.1.0` - original release
- 2020.1.1 - `release-2020.1.1` - patch 1


##### _UI_
Expand All @@ -38,6 +39,10 @@ See Firefly docker guidelines [here](firefly-docker.md).
- MOC overlay support setting the mode MOC_DEFAULT_STYLE to 'outline' or 'fill'
- API examples are at the `firefly/test.html` endpoint

##### _Patches 2020.1_
- 2020.1.1
- fix fixed column cell transparency issue [Firefly-523](https://github.com/Caltech-IPAC/firefly/pull/955)

##### _Pull Request in this release_

- [bug fixes](https://github.com/Caltech-IPAC/firefly/pulls?q=is%3Aclosed+is%3Apr+label%3Abug+milestone%3A2020.1)
Expand Down

0 comments on commit 2921f32

Please sign in to comment.