Skip to content

Commit 90178c4

Browse files
authored
Merge branch 'main' into add-new-notification-topics
2 parents d391ffd + 9439cfc commit 90178c4

17 files changed

Lines changed: 2331 additions & 66 deletions

.github/workflows/cdk-test.yml

Lines changed: 0 additions & 36 deletions
This file was deleted.

.github/workflows/fake-breaking-news.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
build:
2727
runs-on: ubuntu-latest
2828
steps:
29-
- uses: actions/checkout@v6.0.1
29+
- uses: actions/checkout@v6.0.2
3030

3131
- name: Setup JDK and sbt
3232
uses: guardian/setup-scala@v1

.github/workflows/football.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
build:
2626
runs-on: ubuntu-latest
2727
steps:
28-
- uses: actions/checkout@v6.0.1
28+
- uses: actions/checkout@v6.0.2
2929

3030
- name: Setup JDK and sbt
3131
uses: guardian/setup-scala@v1

.github/workflows/notification-worker-lambdas.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
build:
2828
runs-on: ubuntu-latest
2929
steps:
30-
- uses: actions/checkout@v6.0.1
30+
- uses: actions/checkout@v6.0.2
3131

3232
- name: Setup JDK and sbt
3333
uses: guardian/setup-scala@v1

.github/workflows/notification.yml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
- common/**
88
- commoneventconsumer/**
99
- commonscheduleddynamodb/**
10+
- cdk/**
1011
- project/**
1112
- build.sbt
1213
- .github/workflows/notification.yml
@@ -27,11 +28,27 @@ jobs:
2728
build:
2829
runs-on: ubuntu-latest
2930
steps:
30-
- uses: actions/checkout@v6.0.1
31+
- uses: actions/checkout@v6.0.2
3132

3233
- name: Setup JDK and sbt
3334
uses: guardian/setup-scala@v1
3435

36+
- run: corepack enable
37+
38+
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 #v6.2.0
39+
with:
40+
cache: yarn
41+
cache-dependency-path: cdk/yarn.lock
42+
node-version-file: .nvmrc
43+
44+
- name: CDK synth
45+
run: |
46+
cd cdk
47+
yarn install --immutable
48+
yarn lint
49+
yarn test
50+
yarn synth
51+
3552
- name: Compile, test and package
3653
run: sbt "project common" "compile" "test" "project commonscheduledynamodb" "compile" "test" "project notification" "compile" "test" "debian:packageBin"
3754

@@ -57,4 +74,5 @@ jobs:
5774
notification:
5875
- notification/target/notification_1.0-latest_all.deb
5976
notification-cfn:
60-
- notification/conf/notification.yaml
77+
- cdk/cdk.out/Notification-CODE.template.json
78+
- cdk/cdk.out/Notification-PROD.template.json

.github/workflows/registration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
build:
2929
runs-on: ubuntu-latest
3030
steps:
31-
- uses: actions/checkout@v6.0.1
31+
- uses: actions/checkout@v6.0.2
3232

3333
- name: Setup JDK and sbt
3434
uses: guardian/setup-scala@v1

.github/workflows/report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
build:
3131
runs-on: ubuntu-latest
3232
steps:
33-
- uses: actions/checkout@v6.0.1
33+
- uses: actions/checkout@v6.0.2
3434

3535
- name: Setup JDK and sbt
3636
uses: guardian/setup-scala@v1

.github/workflows/sbt-dependency-graph.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
steps:
1212
- name: Checkout branch
1313
id: checkout
14-
uses: actions/checkout@v6.0.1
14+
uses: actions/checkout@v6.0.2
1515
- name: Install Java
1616
id: java
17-
uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
17+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
1818
with:
1919
distribution: corretto
2020
java-version: 17

.github/workflows/schedule-lambda.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
build:
2626
runs-on: ubuntu-latest
2727
steps:
28-
- uses: actions/checkout@v6.0.1
28+
- uses: actions/checkout@v6.0.2
2929

3030
- name: Setup JDK and sbt
3131
uses: guardian/setup-scala@v1

.github/workflows/slo-monitor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
build:
2727
runs-on: ubuntu-latest
2828
steps:
29-
- uses: actions/checkout@v6.0.1
29+
- uses: actions/checkout@v6.0.2
3030

3131
- name: Setup JDK and sbt
3232
uses: guardian/setup-scala@v1

0 commit comments

Comments
 (0)