Skip to content

Commit

Permalink
Merge pull request #279 from tmtsoftware/branch-0.5.x
Browse files Browse the repository at this point in the history
Branch 0.5.x
  • Loading branch information
dencoded authored Nov 15, 2022
2 parents f982447 + 5d33094 commit 97e82c3
Show file tree
Hide file tree
Showing 11 changed files with 222 additions and 396 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ jobs:
release:
runs-on: ubuntu-latest
env:
CSW_VERSION: "4.0.1"
ESW_OCS_ENG_UI_VERSION: "0.2.0"
CSW_VERSION: "5.0.0"
ESW_OCS_ENG_UI_VERSION: "0.3.0"
steps:
- uses: actions/checkout@v2
- uses: coursier/[email protected]
Expand Down
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,23 @@ Here is the repository for ESW: [ESW](https://github.com/tmtsoftware/esw).
All notable changes to this project will be documented in this file.

## Upcoming Changes
n/a

## [ESW v0.5.0] - 2022-11-14

- upgraded to Java 17
- Added `subscribeObserveEvents` in EventApi via Gateway.
- Added `OffsetStart`, `OffsetEnd`, `InputRequestStart` & `InputRequestEnd` sequencer observe events in Kotlin Scripts DSL.

### Documentation
- Reference paradox documentation: https://tmtsoftware.github.io/esw/0.5.0/
- Scaladoc: https://tmtsoftware.github.io/esw/0.5.0/api/scala/index.html

### Supporting Releases

<a name="0-5-0-1"></a>1: [ESW v0.5.0-RC1](https://github.com/tmtsoftware/esw/releases/tag/v0.5.0-RC1) - 2022-09-15<br>
<a name="0-5-0-2"></a>1: [ESW v0.5.0-RC2](https://github.com/tmtsoftware/esw/releases/tag/v0.5.0-RC2) - 2022-10-06<br>

## [ESW v0.4.0] - 2022-02-09

This release contains minor fixes.
Expand Down
13 changes: 12 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ See [here](https://tmtsoftware.github.io/esw/) for a detailed description of the

| esw | csw |
|------------|------------|
| v0.5.0 | v5.0.0 |
| v0.5.0-RC2 | v5.0.0-RC2 |
| v0.5.0-RC1 | v5.0.0-RC1 |
| v0.4.0 | v4.0.1 |
| v0.4.0-RC1 | v4.0.1-RC1 |
| v0.3.0 | v4.0.0 |
Expand All @@ -32,6 +35,7 @@ See [here](https://tmtsoftware.github.io/esw/) for a detailed description of the

| Date | Tag | Source | Docs | Assets |
|------------|--------|-------------------------------------------------------------|------------------------------------------------------------|----------------------------------------------------------------------------|
| 2022-11-14 | v0.5.0 | [esw-0.5.0](https://github.com/tmtsoftware/esw/tree/v0.5.0) | [esw-0.5.0 docs](https://tmtsoftware.github.io/esw/0.5.0/) | [esw-0.5.0 assets](https://github.com/tmtsoftware/esw/releases/tag/v0.5.0) |
| 2022-02-09 | v0.4.0 | [esw-0.4.0](https://github.com/tmtsoftware/esw/tree/v0.4.0) | [esw-0.4.0 docs](https://tmtsoftware.github.io/esw/0.4.0/) | [esw-0.4.0 assets](https://github.com/tmtsoftware/esw/releases/tag/v0.4.0) |
| 2021-09-23 | v0.3.0 | [esw-0.3.0](https://github.com/tmtsoftware/esw/tree/v0.3.0) | [esw-0.3.0 docs](https://tmtsoftware.github.io/esw/0.3.0/) | [esw-0.3.0 assets](https://github.com/tmtsoftware/esw/releases/tag/v0.3.0) |
| 2021-01-29 | v0.2.1 | [esw-0.2.1](https://github.com/tmtsoftware/esw/tree/v0.2.1) | [esw-0.2.1 docs](https://tmtsoftware.github.io/esw/0.2.1/) | [esw-0.2.1 assets](https://github.com/tmtsoftware/esw/releases/tag/v0.2.1) |
Expand All @@ -42,6 +46,8 @@ See [here](https://tmtsoftware.github.io/esw/) for a detailed description of the

| Date | Tag | Source | Docs | Assets |
|------------|------------|---------------------------------------------------------------------|--------------------------------------------------------------------|------------------------------------------------------------------------------------|
| 2022-10-06 | v0.5.0-RC2 | [esw-0.5.0-RC2](https://github.com/tmtsoftware/esw/tree/v0.5.0-RC2) | [esw-0.5.0-RC2 docs](https://tmtsoftware.github.io/esw/0.5.0-RC2/) | [esw-0.5.0-RC2 assets](https://github.com/tmtsoftware/esw/releases/tag/v0.5.0-RC2) |
| 2022-09-15 | v0.5.0-RC1 | [esw-0.5.0-RC1](https://github.com/tmtsoftware/esw/tree/v0.5.0-RC1) | [esw-0.5.0-RC1 docs](https://tmtsoftware.github.io/esw/0.5.0-RC1/) | [esw-0.5.0-RC1 assets](https://github.com/tmtsoftware/esw/releases/tag/v0.5.0-RC1) |
| 2022-01-28 | v0.4.0-RC1 | [esw-0.4.0-RC1](https://github.com/tmtsoftware/esw/tree/v0.4.0-RC1) | [esw-0.4.0-RC1 docs](https://tmtsoftware.github.io/esw/0.4.0-RC1/) | [esw-0.4.0-RC1 assets](https://github.com/tmtsoftware/esw/releases/tag/v0.4.0-RC1) |
| 2021-09-17 | v0.3.0-RC2 | [esw-0.3.0-RC2](https://github.com/tmtsoftware/esw/tree/v0.3.0-RC2) | [esw-0.3.0-RC2 docs](https://tmtsoftware.github.io/esw/0.3.0-RC2/) | [esw-0.3.0-RC2 assets](https://github.com/tmtsoftware/esw/releases/tag/v0.3.0-RC2) |
| 2021-08-23 | v0.3.0-RC1 | [esw-0.3.0-RC1](https://github.com/tmtsoftware/esw/tree/v0.3.0-RC1) | [esw-0.3.0-RC1 docs](https://tmtsoftware.github.io/esw/0.3.0-RC1/) | [esw-0.3.0-RC1 assets](https://github.com/tmtsoftware/esw/releases/tag/v0.3.0-RC1) |
Expand All @@ -54,4 +60,9 @@ See [here](https://tmtsoftware.github.io/esw/) for a detailed description of the

Example code can be found in the [documentation](https://tmtsoftware.github.io/esw/) and in the [examples](examples) subproject.



## Build Instructions

To build everything, including the documentation, run:

sbt publishLocal makeSite
2 changes: 1 addition & 1 deletion RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ A milestone release is cut from master branch as we expect bug fixes / feedback
7. Add changes mention in `CHANGELOG.md` of `esw-contract` in top-level `CHANGELOG.md`
8. Add changes mention in `CHANGELOG.md` of `esw-contract` in the change section of `README.md` of `esw-contract`
9. Exclude projects from `build.sbt` which you do not want to release
10. Update dependent repo version in `Libs.scala`
10. Update dependent repo version in `Libs.scala` and CSW version (commit SHA) in `build.properties`
11. Commit and push the changes to `branch-<major>.<minor>.x` branch and make sure build is green for dev and paradox link pipeline.
12. Make sure build is green for dev and paradox link check pipeline for this branch.
13. Run `release.sh $VERSION$` script by providing version number argument (This triggers release workflow)
Expand Down
9 changes: 9 additions & 0 deletions notes/0.5.0-RC1.markdown
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
## ESW - TMT Executive Software v0.5.0-RC1

This is the v0.5.0-RC1 of the TMT Executive Software.

See [CHANGELOG.md](CHANGELOG.md) for details of all releases.

### Documentation

Paradox documentation can be found here: https://tmtsoftware.github.io/esw/0.5.0-RC1/
9 changes: 9 additions & 0 deletions notes/0.5.0-RC2.markdown
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
## ESW - TMT Executive Software v0.5.0-RC2

This is the v0.5.0-RC2 of the TMT Executive Software.

See [CHANGELOG.md](CHANGELOG.md) for details of all releases.

### Documentation

Paradox documentation can be found here: https://tmtsoftware.github.io/esw/0.5.0-RC2/
9 changes: 9 additions & 0 deletions notes/0.5.0.markdown
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
## ESW - TMT Executive Software v0.5.0

This is the v0.5.0 of the TMT Executive Software.

See [CHANGELOG.md](CHANGELOG.md) for details of all releases.

### Documentation

Paradox documentation can be found here: https://tmtsoftware.github.io/esw/0.5.0/
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sbt.version=1.6.1
csw.version=f1a1b5b
csw.version=680f0f3
38 changes: 0 additions & 38 deletions tools/RTM/README.md

This file was deleted.

Binary file removed tools/RTM/filter.png
Binary file not shown.
Loading

0 comments on commit 97e82c3

Please sign in to comment.