Skip to content

Commit a6ce734

Browse files
JulusianJulusian
committed
Merge branch 'upstream/release52' into upstream/server-side-notifications
2 parents c295ad6 + c4365ad commit a6ce734

File tree

414 files changed

+19371
-5588
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

414 files changed

+19371
-5588
lines changed

‎.github/workflows/audit.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
run: |
3030
yarn
3131
cd meteor
32-
meteor yarn validate:prod-dependencies
32+
meteor npm run validate:prod-dependencies
3333
env:
3434
CI: true
3535

@@ -57,7 +57,7 @@ jobs:
5757
run: |
5858
yarn
5959
cd meteor
60-
meteor yarn run validate:all-dependencies
60+
meteor npm run validate:all-dependencies
6161
env:
6262
CI: true
6363

‎.github/workflows/node.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
# setup zodern:types. No linters are setup, so this simply installs the packages
4747
meteor lint
4848
49-
meteor yarn ci:lint
49+
meteor npm run ci:lint
5050
env:
5151
CI: true
5252

@@ -85,12 +85,12 @@ jobs:
8585
# setup zodern:types. No linters are setup, so this simply installs the packages
8686
meteor lint
8787
88-
NODE_OPTIONS="--max-old-space-size=6144" meteor yarn unitci --force-exit
88+
NODE_OPTIONS="--max-old-space-size=6144" meteor npm run unitci --force-exit
8989
env:
9090
CI: true
9191
- name: Send coverage
9292
if: ((github.event_name == 'pull_request') && (!startsWith(github.head_ref, 'release'))) || ((github.event_name == 'push') && (!startsWith(github.ref_name, 'release')))
93-
uses: codecov/codecov-action@v4
93+
uses: codecov/codecov-action@v5
9494
env:
9595
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
9696

@@ -246,7 +246,7 @@ jobs:
246246
echo "image=$image" >> $GITHUB_OUTPUT
247247
- name: Trivy scanning
248248
if: steps.check-build-and-push.outputs.enable == 'true' && steps.check-ghcr.outputs.enable == 'true' && steps.ghcr-tag.outputs.tags != 0
249-
uses: aquasecurity/trivy-action@0.24.0
249+
uses: aquasecurity/trivy-action@0.29.0
250250
env:
251251
TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
252252
with:
@@ -397,7 +397,7 @@ jobs:
397397
echo "image=$image" >> $GITHUB_OUTPUT
398398
- name: Trivy scanning
399399
if: steps.check-build-and-push.outputs.enable == 'true' && steps.check-ghcr.outputs.enable == 'true' && steps.ghcr-tag.outputs.tags != 0
400-
uses: aquasecurity/trivy-action@0.24.0
400+
uses: aquasecurity/trivy-action@0.29.0
401401
env:
402402
TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
403403
with:

‎.github/workflows/trivy.yml‎

Lines changed: 34 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Scheduled Trivy Scan
22
on:
33
workflow_dispatch:
44
schedule:
5-
- cron: '0 10 * * 1'
5+
- cron: "0 10 * * 1"
66

77
jobs:
88
trivy:
@@ -17,21 +17,21 @@ jobs:
1717

1818
steps:
1919
- name: Run Trivy vulnerability scanner (json)
20-
uses: aquasecurity/trivy-action@0.24.0
20+
uses: aquasecurity/trivy-action@0.29.0
2121
env:
2222
TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
2323
with:
2424
image-ref: ghcr.io/nrkno/sofie-core-${{ matrix.image }}:latest
2525
format: json
26-
output: '${{ matrix.image }}-trivy-scan-results.json'
26+
output: "${{ matrix.image }}-trivy-scan-results.json"
2727

2828
- name: Run Trivy vulnerability scanner (table)
29-
uses: aquasecurity/trivy-action@0.24.0
29+
uses: aquasecurity/trivy-action@0.29.0
3030
env:
3131
TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
3232
with:
3333
image-ref: ghcr.io/nrkno/sofie-core-${{ matrix.image }}:latest
34-
output: '${{ matrix.image }}-trivy-scan-results.txt'
34+
output: "${{ matrix.image }}-trivy-scan-results.txt"
3535

3636
- name: Post all scan results to Github Summary as a table
3737
env:
@@ -44,12 +44,12 @@ jobs:
4444
echo $CODE_BLOCK >> $GITHUB_STEP_SUMMARY
4545
4646
- name: Run Trivy in GitHub SBOM mode and submit results to Dependency Graph
47-
uses: aquasecurity/trivy-action@0.24.0
47+
uses: aquasecurity/trivy-action@0.29.0
4848
env:
4949
TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
5050
with:
51-
format: 'github'
52-
output: 'dependency-results-${{ matrix.image }}.sbom.json'
51+
format: "github"
52+
output: "dependency-results-${{ matrix.image }}.sbom.json"
5353
image-ref: ghcr.io/nrkno/sofie-core-${{ matrix.image }}:latest
5454
github-pat: ${{ secrets.GITHUB_TOKEN }}
5555

@@ -64,46 +64,31 @@ jobs:
6464
echo ${{ env.SUMMARY }}
6565
6666
- name: Send Slack Notification
67-
uses: slackapi/slack-github-action@v1.27.0
67+
uses: slackapi/slack-github-action@v2.0.0
6868
with:
69+
webhook: ${{ secrets.SLACK_WEBHOOK_URL }}
70+
webhook-type: incoming-webhook
6971
payload: |
70-
{
71-
"text": "Trivy scan results",
72-
"blocks": [
73-
{
74-
"type": "header",
75-
"text": {
76-
"type": "plain_text",
77-
"text": "Trivy scan results for sofie-core-${{ matrix.image }}:latest"
78-
}
79-
},
80-
{
81-
"type": "section",
82-
"text": {
83-
"type": "mrkdwn",
84-
"text": ":thisisfine: ${{ env.SUMMARY }}"
85-
}
86-
},
87-
{
88-
"type": "section",
89-
"text": {
90-
"type": "mrkdwn",
91-
"text": "Read the full scan results on Github"
92-
},
93-
"accessory": {
94-
"type": "button",
95-
"text": {
96-
"type": "plain_text",
97-
"text": ":github: Scan results",
98-
"emoji": true
99-
},
100-
"value": "workflow_run",
101-
"url": "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}",
102-
"action_id": "button-action"
103-
}
104-
}
105-
]
106-
}
107-
env:
108-
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
109-
SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
72+
text: "Trivy scan results"
73+
blocks:
74+
- type: "header"
75+
text:
76+
type: "plain_text"
77+
text: "Trivy scan results for sofie-core-${{ matrix.image }}:latest"
78+
- type: "section"
79+
text:
80+
type: "mrkdwn"
81+
text: ":thisisfine: ${{ env.SUMMARY }}"
82+
- type: "section"
83+
text:
84+
type: "mrkdwn"
85+
text: "Read the full scan results on Github"
86+
accessory:
87+
type: "button"
88+
text:
89+
type: "plain_text"
90+
text: ":github: Scan results"
91+
emoji: true
92+
value: "workflow_run"
93+
url: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
94+
action_id: "button-action"

‎DEVELOPER.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ Follow these instructions to start up Sofie Core in development mode. (For produ
3131
```bash
3232
git clone -b master https://github.com/nrkno/sofie-core.git
3333
cd sofie-core
34+
yarn
3435
yarn start
3536
```
3637

@@ -138,12 +139,12 @@ Then submit this as a PR.
138139

139140
### ConfigManifests
140141

141-
The ConfigManifests for Blueprints and Gateways was replaced with JSONSchema in R50.
142+
The ConfigManifests for Blueprints and Gateways was replaced with JSONSchema in R50.
142143
However, one usage by AdlibActions for their userDataManifest remains as this is not something we are actively using.
143144

144145
## Blueprint Migrations
145146

146-
In R49, a replacement flow was added consisting of `validateConfig` and `applyConfig`.
147+
In R49, a replacement flow was added consisting of `validateConfig` and `applyConfig`.
147148
It is no longer recommended to use the old migrations flow for showstyle and studio blueprints.
148149

149150
### ExpectedMediaItems

‎meteor/.meteor/packages‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@
99
# but you can also edit it by hand.
1010

1111
[email protected] # Packages every Meteor app needs to have
12-
[email protected].7 # The database Meteor supports right now
12+
[email protected].10 # The database Meteor supports right now
1313
[email protected] # Reactive variable for tracker
1414

15-
[email protected].7 # Enable ECMAScript2015+ syntax in app code
16-
[email protected].4 # Enable TypeScript syntax in .ts and .tsx modules
15+
[email protected].8 # Enable ECMAScript2015+ syntax in app code
16+
[email protected].5 # Enable TypeScript syntax in .ts and .tsx modules
1717
[email protected] # Server-side component of the `meteor shell` command
1818

19-
[email protected].2 # Meteor's client-side reactive programming library
19+
[email protected].3 # Meteor's client-side reactive programming library
2020

2121
[email protected]
2222
ostrio:meteor-root
23-
accounts-password@2.3.4
23+
accounts-password@2.4.0
2424

2525
julusian:[email protected]
2626
zodern:types

‎meteor/.meteor/release‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
METEOR@2.13.3
1+
METEOR@2.16

‎meteor/.meteor/versions‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,65 @@
1-
[email protected].8
2-
accounts-password@2.3.4
1+
[email protected].11
2+
accounts-password@2.4.0
33
[email protected]
44
[email protected]
5-
[email protected].4
5+
[email protected].5
66
[email protected]
77
[email protected]
88
[email protected]
9-
[email protected].1
9+
[email protected].2
1010
[email protected]
11-
check@1.3.2
11+
check@1.4.1
1212
[email protected]
13-
[email protected].1
14-
[email protected].0
15-
[email protected].0
16-
ddp-server@2.6.2
13+
[email protected].2
14+
[email protected].1
15+
[email protected].1
16+
ddp-server@2.7.1
1717
[email protected]
1818
[email protected]
19-
[email protected].7
19+
[email protected].8
2020
[email protected]
2121
[email protected]
2222
[email protected]
2323
[email protected]
24-
[email protected].5
24+
[email protected].6
2525
[email protected]
26-
[email protected].3
26+
[email protected].4
2727
[email protected]
2828
[email protected]
2929
[email protected]
3030
[email protected]
3131
julusian:[email protected]
3232
kschingiz:[email protected]
3333
[email protected]
34-
[email protected].2
35-
[email protected].3
34+
[email protected].4
35+
[email protected].5
3636
[email protected]
37-
[email protected].3
38-
[email protected].9
39-
modules@0.19.0
37+
[email protected].4
38+
[email protected].10
39+
modules@0.20.0
4040
[email protected]
41-
[email protected].7
41+
[email protected].10
4242
[email protected]
4343
[email protected]
4444
[email protected]
45-
npm-mongo@4.16.0
45+
npm-mongo@4.17.2
4646
[email protected]
4747
ostrio:[email protected]
4848
[email protected]
4949
[email protected]
5050
[email protected]
51-
[email protected].7
51+
[email protected].8
5252
[email protected]
5353
[email protected]
5454
[email protected]
5555
[email protected]
5656
[email protected]
5757
[email protected]
58-
[email protected].1
59-
[email protected].2
60-
[email protected].4
61-
underscore@1.0.13
58+
[email protected].2
59+
[email protected].3
60+
[email protected].5
61+
underscore@1.6.1
6262
[email protected]
63-
[email protected].5
63+
[email protected].8
6464
[email protected]
6565
zodern:[email protected]

‎meteor/CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
### [1.51.2](https://github.com/nrkno/tv-automation-server-core/compare/v1.51.1...v1.51.2) (2024-11-21)
6+
7+
8+
### Bug Fixes
9+
10+
* Include previousPartInstance in check to orphan segments rather than remove them. ([2c113b5](https://github.com/nrkno/tv-automation-server-core/commit/2c113b58b205198d13f0fc7e2114704311eb915b))
11+
* updatePartInstancesSegmentIds: take into account when multiple segments have been merged into one. ([bdab8c4](https://github.com/nrkno/tv-automation-server-core/commit/bdab8c4e4ee1e67a3568cccc98106bb7f1258673))
12+
513
## [1.51.0-in-testing.3](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.2...v1.51.0-in-testing.3) (2024-09-25)
614

715
## [1.51.0-in-testing.2](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.1...v1.51.0-in-testing.2) (2024-09-24)

‎meteor/__mocks__/defaultCollectionObjects.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,9 @@ export function defaultStudio(_id: StudioId): DBStudio {
110110
mediaPreviewsUrl: '',
111111
minimumTakeSpan: DEFAULT_MINIMUM_TAKE_SPAN,
112112
fallbackPartDuration: DEFAULT_FALLBACK_PART_DURATION,
113+
allowHold: false,
114+
allowPieceDirectPlay: false,
115+
enableBuckets: false,
113116
},
114117
_rundownVersionHash: '',
115118
routeSetsWithOverrides: wrapDefaultObject({}),
@@ -134,7 +137,6 @@ export function defaultSegment(_id: SegmentId, rundownId: RundownId): DBSegment
134137
externalId: unprotectString(_id),
135138
rundownId: rundownId,
136139
name: 'Default Segment',
137-
externalModified: 1,
138140
}
139141
}
140142

0 commit comments

Comments
 (0)