Skip to content

Commit fc111ea

Browse files
committed
Merge branch 'main' into release53
2 parents a4acfea + 2cd0f80 commit fc111ea

File tree

84 files changed

+4403
-35
lines changed

Some content is hidden

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

84 files changed

+4403
-35
lines changed

.github/workflows/node.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ jobs:
252252
echo "image=$image" >> $GITHUB_OUTPUT
253253
- name: Trivy scanning
254254
if: steps.check-build-and-push.outputs.enable == 'true' && steps.check-ghcr.outputs.enable == 'true' && steps.ghcr-tag.outputs.tags != 0
255-
uses: aquasecurity/trivy-action@0.30.0
255+
uses: aquasecurity/trivy-action@0.32.0
256256
env:
257257
TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
258258
with:
@@ -405,7 +405,7 @@ jobs:
405405
echo "image=$image" >> $GITHUB_OUTPUT
406406
- name: Trivy scanning
407407
if: steps.check-build-and-push.outputs.enable == 'true' && steps.check-ghcr.outputs.enable == 'true' && steps.ghcr-tag.outputs.tags != 0
408-
uses: aquasecurity/trivy-action@0.30.0
408+
uses: aquasecurity/trivy-action@0.32.0
409409
env:
410410
TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
411411
with:
@@ -480,7 +480,7 @@ jobs:
480480
CI: true
481481

482482
test-packages:
483-
name: Test Package
483+
name: Test Package (main)
484484
runs-on: ubuntu-latest
485485
timeout-minutes: 15
486486

@@ -548,8 +548,8 @@ jobs:
548548
env:
549549
CI: true
550550
- name: Send coverage
551-
if: (matrix.node-version == '18.x' || matrix.send-coverage == true) && ((github.event_name == 'pull_request') && ((!startsWith(github.head_ref, 'release'))) || ((github.event_name == 'push') && (!startsWith(github.ref_name, 'release'))))
552-
uses: codecov/codecov-action@v4
551+
if: (matrix.node-version == '22.x' || matrix.send-coverage == true) && (((github.event_name == 'pull_request') && (!startsWith(github.head_ref, 'release'))) || ((github.event_name == 'push') && (!startsWith(github.ref_name, 'release'))))
552+
uses: codecov/codecov-action@v5
553553
env:
554554
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
555555

.github/workflows/trivy.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
steps:
1919
- name: Run Trivy vulnerability scanner (json)
20-
uses: aquasecurity/trivy-action@0.30.0
20+
uses: aquasecurity/trivy-action@0.32.0
2121
env:
2222
TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
2323
with:
@@ -26,7 +26,7 @@ jobs:
2626
output: "${{ matrix.image }}-trivy-scan-results.json"
2727

2828
- name: Run Trivy vulnerability scanner (table)
29-
uses: aquasecurity/trivy-action@0.30.0
29+
uses: aquasecurity/trivy-action@0.32.0
3030
env:
3131
TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
3232
with:
@@ -44,7 +44,7 @@ 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.30.0
47+
uses: aquasecurity/trivy-action@0.32.0
4848
env:
4949
TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
5050
with:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ The _Core_ is a _Meteor/Node.JS_-based web server that serves the web GUIs as we
88

99
## General Sofie System Information
1010

11-
- [_Sofie_ Documentation](https://sofie-automation.github.io/sofie-core//)
11+
- [_Sofie_ Documentation](https://sofie-automation.github.io/sofie-core/)
1212
- [_Sofie_ Releases](https://sofie-automation.github.io/sofie-core//releases)
1313
- [Contribution Guidelines](CONTRIBUTING.md)
1414
- [License](LICENSE)

meteor/CHANGELOG.md

Lines changed: 159 additions & 0 deletions
Large diffs are not rendered by default.

meteor/server/api/ingest/mosDevice/mosIntegration.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ export namespace MosIntegration {
163163

164164
const rundownExternalId = parseMosString(Action.RunningOrderID)
165165

166-
logger.info(`mosRoStoryInsert after "${Action.StoryID}" Stories: ${Stories.map((s) => s.ID)}`)
166+
logger.info(`mosRoStoryInsert before "${Action.StoryID}" Stories: ${Stories.map((s) => s.ID)}`)
167167
logger.debug(Action, Stories)
168168

169169
await runIngestOperation(studioId, IngestJobs.MosInsertStory, {

meteor/yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1244,7 +1244,7 @@ __metadata:
12441244
resolution: "@sofie-automation/shared-lib@portal:../packages/shared-lib::locator=automation-core%40workspace%3A."
12451245
dependencies:
12461246
"@mos-connection/model": "npm:^4.2.2"
1247-
timeline-state-resolver-types: "npm:9.3.0-release52.2"
1247+
timeline-state-resolver-types: "npm:9.3.0"
12481248
tslib: "npm:^2.8.1"
12491249
type-fest: "npm:^4.33.0"
12501250
languageName: node
@@ -9983,12 +9983,12 @@ __metadata:
99839983
languageName: node
99849984
linkType: hard
99859985

9986-
"timeline-state-resolver-types@npm:9.3.0-release52.2":
9987-
version: 9.3.0-release52.2
9988-
resolution: "timeline-state-resolver-types@npm:9.3.0-release52.2"
9986+
"timeline-state-resolver-types@npm:9.3.0":
9987+
version: 9.3.0
9988+
resolution: "timeline-state-resolver-types@npm:9.3.0"
99899989
dependencies:
99909990
tslib: "npm:^2.6.3"
9991-
checksum: 10/2f50474e96d6f10d085788b59c2a8a2bedcf8511646424afcb9c2b421798e689894028629f0c55d0b76dc5f543cba06367c7be93c2662608a3804f60c108ded2
9991+
checksum: 10/2193715a9a3acd89134b6dd102aa8a0adc3386a286744255788d44343e9e820a4cec293609397139a1506d326f0689599e8cc0ca50868c05ad4e78b90f5324ec
99929992
languageName: node
99939993
linkType: hard
99949994

packages/blueprints-integration/CHANGELOG.md

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,56 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [1.52.0](https://github.com/Sofie-Automation/sofie-core/compare/v1.52.0-in-testing.1...v1.52.0) (2025-06-30)
7+
8+
**Note:** Version bump only for package @sofie-automation/blueprints-integration
9+
10+
11+
12+
13+
14+
# [1.52.0-in-testing.1](https://github.com/Sofie-Automation/sofie-core/compare/v1.51.7...v1.52.0-in-testing.1) (2025-06-05)
15+
16+
17+
### Bug Fixes
18+
19+
* add `getCurrentTime` to `SyncIngestUpdateToPartInstanceContext` ([bb35893](https://github.com/Sofie-Automation/sofie-core/commit/bb358938937433af7157d7f821400badf6f10c2b))
20+
21+
22+
23+
# [1.52.0-in-testing.0](https://github.com/Sofie-Automation/sofie-core/compare/v1.51.6...v1.52.0-in-testing.0) (2025-02-04)
24+
25+
26+
### Bug Fixes
27+
28+
* review comments ([752a30a](https://github.com/Sofie-Automation/sofie-core/commit/752a30a69ea4a864239a438b278c3b53d06a12a2))
29+
30+
31+
### Features
32+
33+
* add in-out words to the VT type ([7bec461](https://github.com/Sofie-Automation/sofie-core/commit/7bec4619836cb92ab85331afe130d0ed54ca976e))
34+
* add RemoteSpeak source layer type ([a9b98e7](https://github.com/Sofie-Automation/sofie-core/commit/a9b98e7a544f5dab90c6cc17713abbdc5b930744))
35+
* add segment timing countdownType ([9aaa2dd](https://github.com/Sofie-Automation/sofie-core/commit/9aaa2dd48e841177f32a8d16a2e6c37706c6c2ae))
36+
* allow adlib-actions to remove pieces from the current partInstance ([902e7ff](https://github.com/Sofie-Automation/sofie-core/commit/902e7fffe6cc23c48f7bd86e23595d83f74d84fa))
37+
* allow drag from mos-plugin to part ([d51ba2f](https://github.com/Sofie-Automation/sofie-core/commit/d51ba2fe8b8effa6037f379534b357d5320cc3c7))
38+
* config package manager from blueprints ([685364d](https://github.com/Sofie-Automation/sofie-core/commit/685364d5fd4af690a55292ba99ff8ecff386f893))
39+
* configure Core system/studio settings via blueprints ([ef14c8f](https://github.com/Sofie-Automation/sofie-core/commit/ef14c8f4f139be273ce8a8a3c21e6cc0f580d297))
40+
* configure peripheral device settings from blueprints ([878214b](https://github.com/Sofie-Automation/sofie-core/commit/878214bf983ed12fe82822b47b9c629727d4c20d))
41+
* customizable package status messages ([2ac7cb1](https://github.com/Sofie-Automation/sofie-core/commit/2ac7cb1eb95edc8f901168066396110b2cd71faa))
42+
* exclude pieces from part keepalive ([74bea6c](https://github.com/Sofie-Automation/sofie-core/commit/74bea6cf3a978410bc5e79b325a6fe8b0b190ba9))
43+
* list routesets from blueprints adlib action ([c228251](https://github.com/Sofie-Automation/sofie-core/commit/c22825130793c843f7290d3ee844b805bf2788f1))
44+
* meteor 3.0.4 ([8670727](https://github.com/Sofie-Automation/sofie-core/commit/8670727bba5ac9cffe0e5d36b4bd45d6664482be))
45+
* modify datastore in `onRundownActivate` SOFIE-3310 ([#1240](https://github.com/Sofie-Automation/sofie-core/issues/1240)) ([8a0759f](https://github.com/Sofie-Automation/sofie-core/commit/8a0759f610497e37493e8a798aa0dd13f4f57119))
46+
* move next part should respect quickloop bounds ([8f0153e](https://github.com/Sofie-Automation/sofie-core/commit/8f0153e294a4f4842e333cc3c4e2bacbf6c4c236))
47+
* processIngestData & userEditOperations ([e69a4fc](https://github.com/Sofie-Automation/sofie-core/commit/e69a4fc2f4e3d1e6c6b287e34a3b2f55080ce0c4))
48+
* quickloop improvements ([f1f77fa](https://github.com/Sofie-Automation/sofie-core/commit/f1f77fa11b50fe93afc50631988d7c2aa6306f13))
49+
* routeset config defined in blueprints ([e839b97](https://github.com/Sofie-Automation/sofie-core/commit/e839b97c0205df38e5bc7ab816a9c79406a7d767))
50+
* update meteor to 3.1 and node to 22 ([61b6854](https://github.com/Sofie-Automation/sofie-core/commit/61b6854261a03f04e81416b9d37ee995e3a10108))
51+
52+
53+
54+
55+
656
# [1.52.0-in-testing.0](https://github.com/nrkno/sofie-core/compare/v1.51.6...v1.52.0-in-testing.0) (2025-02-04)
757

858
### Bug Fixes

packages/documentation/releases/releases.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ slug: /
88

99
import GitHubReleases from '../src/components/GitHubReleases'
1010

11-
Current, future, and past releases of _Sofie_ are all tracked on [**NRK's GitHub repository**](https://github.com/Sofie-Automation/Sofie-TV-automation/issues?utf8=%E2%9C%93&q=is%3Aissue+label%3ARelease).
11+
Current, future, and past releases of _Sofie_ are all tracked on [**our GitHub repository**](https://github.com/Sofie-Automation/Sofie-TV-automation/issues?utf8=%E2%9C%93&q=is%3Aissue+label%3ARelease).
1212

1313
<GitHubReleases org="Sofie-Automation" repo="Sofie-TV-Automation" releaseLabel="Release" state="all" />

packages/documentation/src/components/HomepageFeatures.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const FeatureList = [
3737
{
3838
title: 'Community',
3939
Svg: require('../img/undraw_work_chat.svg').default,
40-
link: 'https://join.slack.com/t/sofietv/shared_invite/enQtNTk2Mzc3MTQ1NzAzLTJkZjMyMDg3OGM0YWU3MmU4YzBhZDAyZWI1YmJmNmRiYWQ1OTZjYTkzOTkzMTA2YTE1YjgxMmVkM2U1OGZlNWI',
40+
link: 'https://join.slack.com/t/sofietv/shared_invite/zt-2bfz8l9lw-azLeDB55cvN2wvMgqL1alA',
4141
description: (
4242
<>
4343
Please join the growing <em>Slack</em> to meet the developers and other <em>Sofie</em> users.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
title: About Sofie
3+
hide_table_of_contents: true
4+
sidebar_label: About Sofie
5+
sidebar_position: 1
6+
---
7+
8+
# NRK Sofie TV Automation System
9+
10+
![The producer's view in Sofie](https://raw.githubusercontent.com/Sofie-Automation/Sofie-TV-automation/main/images/Sofie_GUI_example.jpg)
11+
12+
_**Sofie**_ is a web-based TV automation system for studios and live shows, used in daily live TV news productions by the Norwegian public&nbsp;service broadcaster [**NRK**](https://www.nrk.no/about/) since September 2018.
13+
14+
## Key Features
15+
16+
- User-friendly, modern web-based GUI
17+
- State-based device control and playout of video, audio, and graphics
18+
- Modular device-control architecture with support for several hardware \(and software\) setups
19+
- Modular data-ingest architecture, supports MOS and Google spreadsheets
20+
- Plug-in architecture for programming shows
21+
22+
_The NRK logo is a registered trademark of Norsk rikskringkasting AS. The license does not grant any right to use, in any way, any trademarks, service marks or logos of Norsk rikskringkasting AS._

0 commit comments

Comments
 (0)