Skip to content

Commit 033d159

Browse files
committed
Release 2020.1.0: document updates
1 parent 7d94992 commit 033d159

File tree

3 files changed

+23
-12
lines changed

3 files changed

+23
-12
lines changed

config/app.config

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

docs/new-release-procedure.md

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@
88
- `BuildMinor =` _release of the year_
99
- `BuildRev =` _patch #_
1010

11-
1. **Update Release Notes**
12-
- In the `rc-yyyy.x` branch, Edit the release notes and do the following:
11+
1. **Update Release Notes.**
12+
In the `rc-yyyy.x` branch, edit the release notes and do the following (firefly/docs/release-notes.md):
1313
- Modify the note for the unreleased version to remove the `(unreleased, current development)` from the title
1414
- After looking at docker tags make sure all the important changes are included in the notes.
1515
- Start a new section for the next release, mark in the title with `(unreleased, current development)`
1616
- Make sure you edit the docker tags section of this release
17+
- Update the "Pull Request for this release section", change the text and the URLs for all PR and bug fixes
1718

18-
1. **Merge and Push**
19-
- merge the `rc-yyyy.m` branch back into `dev`
20-
- push the `rc-yyyy.m` branch
21-
- wait to the final step to push def
2219

23-
1. **Tag the release**
20+
1. **Commit, Tag**
21+
- commit you changes
2422
- tag the `rc-yyyy.m` branch with the release `release-yyyy.m.r`
2523
- _example:_ the second release from branch `rc-2020.2` with the git tagged with `release-2020.2.1`
2624

27-
1. **Push tags to GitHub**: `git push origin --tags`
25+
1. **Push to GitHub**:
26+
- push the rc: _example:_ `git push origin rc-2020.1`
27+
- push the tags: `git push origin --tags`
2828

2929
1. **Build docker images**
3030
- Best to use Jenkins: http://irsawebdev5.ipac.caltech.edu:8100/view/k8s/job/k8s_firefly/build?delay=0sec
@@ -51,7 +51,8 @@
5151
1. **Publish a new release on Github.**
5252
- The text should use the [release-page-template.md](release-page-template.md)
5353

54-
1. **Reset the Version in config to development**
54+
1. **Merge RR, Reset the Version in config to development, Push dev**
55+
- merge rc into dev
5556
- In the `dev` branch, Edit `firefly/config/app.config` with the correct version.
5657
- Modify:
5758
- `BuildMajor =` _year_

docs/release-notes.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@ See Firefly docker guidelines [here](firefly-docker.md).
88

99
- docker tag: `nightly`
1010

11+
### Version 2020.1
12+
13+
##### _Docker tags, releases and patches_
14+
15+
- 2020.1 latest - `release-2020.1`
16+
- 2020.1.0 - `release-2020.1.1` - original release
17+
18+
1119
##### _UI_
1220
- Tables now handle array type data ([Firefly-150](https://github.com/Caltech-IPAC/firefly/pull/922)
1321
- Table Options UI Improvements ([Firefly-471](https://github.com/Caltech-IPAC/firefly/pull/928))
@@ -27,11 +35,13 @@ See Firefly docker guidelines [here](firefly-docker.md).
2735

2836
##### _API_
2937
- Add fixed column feature to table API ([Firefly-442](https://github.com/Caltech-IPAC/firefly/pull/941)))
30-
38+
- MOC overlay support setting the mode MOC_DEFAULT_STYLE to 'outline' or 'fill'
39+
- API examples are at the `firefly/test.html` endpoint
40+
3141
##### _Pull Request in this release_
3242

3343
- [bug fixes](https://github.com/Caltech-IPAC/firefly/pulls?q=is%3Aclosed+is%3Apr+label%3Abug+milestone%3A2020.1)
34-
- [All PRs](https://github.com/Caltech-IPAC/firefly/pulls?utf8=%E2%9C%93&q=is%3Aclosed+is%3Apr+)
44+
- [All PRs](https://github.com/Caltech-IPAC/firefly/pulls?q=is%3Amerged+is%3Apr++milestone%3A2020.1+)
3545

3646
### Version 2019.4
3747

0 commit comments

Comments
 (0)