Skip to content

Commit 6ea9cdc

Browse files
abrightonabrighton
committed
Fixed some broken links, updated GitHub actions, Jenkins file
1 parent f9e7278 commit 6ea9cdc

File tree

15 files changed

+52
-30
lines changed

15 files changed

+52
-30
lines changed

‎.github/workflows/branchLinkCheck.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v4.2.2
13+
- uses: actions/checkout@v4
1414
with:
1515
ref: branch-0.6.x
1616
- uses: coursier/setup-action@v1.2.0
1717
with:
1818
jvm: temurin:1.21
1919
- uses: coursier/cache-action@v6
2020

21-
# - name: Paradox Validate Links
22-
# run: sbtn docs/paradoxValidateLinks
21+
- name: Paradox Validate Links
22+
run: sbtn docs/paradoxValidateLinks
2323

2424
- name: Notify slack
2525
if: always()

‎.github/workflows/dev.yml‎

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,38 @@ jobs:
4242
sbt -Dsbt.log.noformat=true publishLocal
4343
4444
- name: Unit Tests
45-
run: sbt -Dsbt.log.noformat=true -Dpekko.actor.serialize-messages=on -DenableCoverage=false -DgenerateStoryReport=false -DdisableIntegrationTests test:test
45+
run: sbt -Dsbt.log.noformat=true -Dpekko.actor.serialize-messages=on -DenableCoverage=true -DgenerateStoryReport=true -DdisableIntegrationTests Test/test
4646

4747
- name: Integration Tests
48-
run: sbt -Dsbt.log.noformat=true -Dpekko.actor.serialize-messages=on -DenableCoverage=false -DgenerateStoryReport=false esw-integration-test/test:test
48+
run: sbt -Dsbt.log.noformat=true -Dpekko.actor.serialize-messages=on -DenableCoverage=true -DgenerateStoryReport=true esw-integration-test/Test/test
49+
50+
- name: Coverage Report
51+
run: |
52+
sbt -DenableCoverage=true coverageReport
53+
sbt coverageAggregate
54+
55+
- name: Upload Coverage Report
56+
uses: actions/upload-artifact@v4
57+
with:
58+
name: Coverage Report
59+
path: target/scala-3.6.2/scoverage-report
4960

5061
- name: Multi-Jvm Tests
51-
run: sbt -Dsbt.log.noformat=true -DgenerateStoryReport=false esw-integration-test/multi-jvm:test
62+
run: sbt -Dsbt.log.noformat=true -DgenerateStoryReport=true esw-integration-test/MultiJvm/test
63+
64+
- name: Generate RTM
65+
if: always()
66+
continue-on-error: true
67+
run: |
68+
cs launch --channel https://raw.githubusercontent.com/tmtsoftware/osw-apps/branch-6.0.x/apps.json rtm:b7997a9 -- target/RTM/testStoryMapping.txt tools/RTM/storyRequirementMapping.csv target/RTM/testRequirementsMapping.txt
69+
70+
- name: Upload RTM
71+
if: always()
72+
continue-on-error: true
73+
uses: actions/upload-artifact@v4
74+
with:
75+
name: RTM
76+
path: target/RTM
5277

5378
- name: Notify slack
5479
if: always()

‎.github/workflows/dev.yml.orig‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ jobs:
4141
sbt -DenableFatalWarnings=true makeSite
4242

4343
- name: Unit Tests
44-
run: sbt -Dpekko.actor.serialize-messages=on -DenableCoverage=true -DgenerateStoryReport=true -DdisableIntegrationTests test:test
44+
run: sbt -Dpekko.actor.serialize-messages=on -DenableCoverage=true -DgenerateStoryReport=true -DdisableIntegrationTests Test/test
4545

4646
- name: Integration Tests
47-
run: sbt -Dpekko.actor.serialize-messages=on -DenableCoverage=true -DgenerateStoryReport=true esw-integration-test/test:test
47+
run: sbt -Dpekko.actor.serialize-messages=on -DenableCoverage=true -DgenerateStoryReport=true esw-integration-test/Test/test
4848

4949
- name: Coverage Report
5050
run: |
@@ -64,7 +64,7 @@ jobs:
6464
if: always()
6565
continue-on-error: true
6666
run: |
67-
cs launch --channel https://raw.githubusercontent.com/tmtsoftware/osw-apps/master/apps.json rtm:b7997a9 -- target/RTM/testStoryMapping.txt tools/RTM/storyRequirementMapping.csv target/RTM/testRequirementsMapping.txt
67+
cs launch --channel https://raw.githubusercontent.com/tmtsoftware/osw-apps/branch-6.0.x/apps.json rtm:b7997a9 -- target/RTM/testStoryMapping.txt tools/RTM/storyRequirementMapping.csv target/RTM/testRequirementsMapping.txt
6868

6969
- name: Upload RTM
7070
if: always()

‎.github/workflows/masterLinkCheck.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v4.2.2
13+
- uses: actions/checkout@v4
1414
- uses: coursier/setup-action@v1.2.0
1515
with:
1616
jvm: temurin:1.21

‎.github/workflows/release.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
- uses: actions/setup-node@v1
2323
with:
24-
node-version: "20.6.1"
24+
node-version: "22.14.0"
2525
registry-url: "https://registry.npmjs.org"
2626

2727
- name: Install Redis
@@ -51,18 +51,18 @@ jobs:
5151
sbt -DenableFatalWarnings=true makeSite
5252
5353
- name: Tests
54-
run: sbt -Dsbt.log.noformat=true -Dpekko.actor.serialize-messages=on -DenableCoverage=true -DgenerateStoryReport=true test:test
54+
run: sbt -Dsbt.log.noformat=true -Dpekko.actor.serialize-messages=on -DenableCoverage=true -DgenerateStoryReport=true Test/test
5555

5656
- name: Coverage Report
5757
run: |
5858
sbt -Dsbt.log.noformat=true -DenableCoverage=true coverageReport
5959
sbtn coverageAggregate
6060
6161
- name: Upload Coverage Report
62-
uses: actions/upload-artifact@v2
62+
uses: actions/upload-artifact@v4
6363
with:
6464
name: Coverage Report
65-
path: target/scala-2.13/scoverage-report
65+
path: target/scala-3.6.2/scoverage-report
6666

6767
- name: Delete js targets
6868
continue-on-error: true
@@ -75,12 +75,12 @@ jobs:
7575
if: always()
7676
continue-on-error: true
7777
run: |
78-
cs launch --channel https://raw.githubusercontent.com/tmtsoftware/osw-apps/master/apps.json rtm:b7997a9 -- target/RTM/testStoryMapping.txt tools/RTM/storyRequirementMapping.csv target/RTM/testRequirementsMapping.txt
78+
cs launch --channel https://raw.githubusercontent.com/tmtsoftware/osw-apps/branch-6.0.x/apps.json rtm:b7997a9 -- target/RTM/testStoryMapping.txt tools/RTM/storyRequirementMapping.csv target/RTM/testRequirementsMapping.txt
7979
8080
- name: Upload RTM
8181
if: always()
8282
continue-on-error: true
83-
uses: actions/upload-artifact@v2
83+
uses: actions/upload-artifact@v4
8484
with:
8585
name: RTM
8686
path: target/RTM

‎docs/src/main/technical/apps/getting-apps.md‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ To use *any* ESW application, `coursier` must be installed on your machine.
1010

1111
The installation process is documented in the [coursier installation document](https://get-coursier.io/docs/cli-installation).
1212

13-
This blog post: [Single Command Scala Setup](https://alexarchambault.github.io/posts/2020-09-21-cs-setup.html)
14-
by Alex Archambault, is a more friendly introduction to `coursier`.
15-
1613
## 2. Add TMT Apps channel to `coursier`
1714

1815
TMT apps are installed using a `coursier` channel. The channel must be added to the local installation of `coursier`
@@ -22,13 +19,13 @@ use one of the following commands.
2219
For developer machine setup, type:
2320

2421
```bash
25-
cs channel --add https://raw.githubusercontent.com/tmtsoftware/osw-apps/master/apps.json
22+
cs channel --add https://raw.githubusercontent.com/tmtsoftware/osw-apps/branch-6.0.x/apps.json
2623
```
2724

2825
For a production machine setup, type:
2926

3027
```bash
31-
cs channel --add https://raw.githubusercontent.com/tmtsoftware/osw-apps/master/apps.prod.json
28+
cs channel --add https://raw.githubusercontent.com/tmtsoftware/osw-apps/branch-6.0.x/apps.prod.json
3229
```
3330

3431
## 3. Starting CSW Services

‎docs/src/main/technical/esw-application-parts.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ Some of the examples for Actor remote message codecs are `OcsCodecs`, `Sequencer
252252

253253
#### HTTP-based Communication
254254

255-
HTTP based services are implemented using [msocket](https://github.com/tmtsoftware/msocket) library which usage [Pekko HTTP](https://doc.pekko.io/docs/pekko-http/current/) under the hood.
255+
HTTP based services are implemented using [msocket](https://github.com/tmtsoftware/msocket) library which usage [Pekko HTTP](https://pekko.apache.org/docs/pekko-http/current/) under the hood.
256256

257257
MSocket exposes two factories, `PostRouteFactory[Req]` and `WebsocketRouteFactory[Req]` for generating HTTP and Websocket routes respectively.
258258
Both these factories require implicit decoder in scope, so that Pekko HTTP server can decode the incoming HTTP request.

‎esw-agent-pekko/esw-agent-pekko-app/src/main/resources/application.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ agent {
44
osw.version.confPath = "/tmt/osw/version.conf"
55

66
// coursier.channel: "https://raw.githubusercontent.com/tmtsoftware/osw-apps/master/apps.prod.json"
7-
coursier.channel: "https://raw.githubusercontent.com/tmtsoftware/osw-apps/Allan/pekko-scala3-update/apps.json"
7+
coursier.channel: "https://raw.githubusercontent.com/tmtsoftware/osw-apps/branch-6.0.x/apps.json"
88
}
99

1010
csw-logging {

‎esw-agent-pekko/esw-agent-pekko-app/src/test/scala/esw/agent/pekko/app/Cs.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ package esw.agent.pekko.app
22

33
object Cs {
44
// val channel = "https://raw.githubusercontent.com/tmtsoftware/osw-apps/master/apps.json"
5-
val channel = "https://raw.githubusercontent.com/tmtsoftware/osw-apps/Allan/pekko-scala3-update/apps.json"
5+
val channel = "https://raw.githubusercontent.com/tmtsoftware/osw-apps/branch-6.0.x/apps.json"
66
}

‎esw-integration-test/src/test/scala/esw/shell/MainTest.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class MainTest extends BaseTestSuite {
99
// XXX Ignoring for now, since apps.json has not been updated to use this branch
1010
"verify esw-shell compiles and starts successfully" ignore {
1111
// val channel = "https://raw.githubusercontent.com/tmtsoftware/osw-apps/master/apps.json"
12-
val channel = "https://raw.githubusercontent.com/tmtsoftware/osw-apps/Allan/pekko-scala3-update/apps.json"
12+
val channel = "https://raw.githubusercontent.com/tmtsoftware/osw-apps/branch-6.0.x/apps.json"
1313
val version = "0.1.0-SNAPSHOT"
1414
val commands = List("cs", "launch", "--channel", channel, s"esw-shell:$version")
1515
val processBuilder = new ProcessBuilder(commands*)

0 commit comments

Comments
 (0)