Skip to content

Commit 2921f32

Browse files
committed
Release 2020.1.1: document updates
1 parent cda5452 commit 2921f32

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

config/app.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// adjustable application runtime properties
33
//---------------------------------------------
44
BuildMajor = 2020
5-
BuildMinor = -1
6-
BuildRev = 0
5+
BuildMinor = 1
6+
BuildRev = 1
77
BuildNumber = 0
88
BuildType = "Final"
99

docs/new-release-procedure.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@
1818

1919

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

25+
2526
1. **Push to GitHub**:
2627
- push the rc: _example:_ `git push origin rc-2020.1`
2728
- push the tags: `git push origin --tags`
@@ -46,11 +47,11 @@
4647
1. **Edit docker hub instructions**
4748
- Go the the Firefly page on docker hub. https://cloud.docker.com/u/ipac/repository/docker/ipac/firefly
4849
- Edit the markdown to include the recent tags
49-
5050

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

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

docs/release-notes.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ See Firefly docker guidelines [here](firefly-docker.md).
1313
##### _Docker tags, releases and patches_
1414

1515
- 2020.1 latest - `release-2020.1`
16-
- 2020.1.0 - `release-2020.1.1` - original release
16+
- 2020.1.0 - `release-2020.1.0` - original release
17+
- 2020.1.1 - `release-2020.1.1` - patch 1
1718

1819

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

42+
##### _Patches 2020.1_
43+
- 2020.1.1
44+
- fix fixed column cell transparency issue [Firefly-523](https://github.com/Caltech-IPAC/firefly/pull/955)
45+
4146
##### _Pull Request in this release_
4247

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

0 commit comments

Comments
 (0)