Skip to content

Commit 80a166f

Browse files
nytaminnytamin
committed
Merge branch 'release52' into release53
# Conflicts: # meteor/package.json # meteor/yarn.lock # packages/blueprints-integration/package.json # packages/corelib/package.json # packages/documentation/package.json # packages/job-worker/package.json # packages/lerna.json # packages/live-status-gateway/package.json # packages/meteor-lib/package.json # packages/mos-gateway/package.json # packages/openapi/package.json # packages/playout-gateway/package.json # packages/server-core-integration/package.json # packages/shared-lib/package.json # packages/webui/package.json # packages/yarn.lock
2 parents 55ffea8 + 2215f8f commit 80a166f

File tree

13 files changed

+809
-596
lines changed

13 files changed

+809
-596
lines changed

‎meteor/CHANGELOG.md‎

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

‎meteor/server/migration/1_52_0.ts‎

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

‎meteor/server/migration/X_X_X.ts‎

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

‎meteor/server/migration/migrations.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ addSteps1_50_0()
3737
import { addSteps as addSteps1_51_0 } from './1_51_0'
3838
addSteps1_51_0()
3939

40+
import { addSteps as addSteps1_52_0 } from './1_52_0'
41+
addSteps1_52_0()
42+
4043
// Migrations for the in-development release:
4144
import { addSteps as addStepsX_X_X } from './X_X_X'
4245
addStepsX_X_X()

‎meteor/yarn.lock‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1191,7 +1191,7 @@ __metadata:
11911191
resolution: "@sofie-automation/shared-lib@portal:../packages/shared-lib::locator=automation-core%40workspace%3A."
11921192
dependencies:
11931193
"@mos-connection/model": "npm:^4.2.2"
1194-
timeline-state-resolver-types: "npm:9.2.0-nightly-release52-20250204-101510-3576f2cd8.0"
1194+
timeline-state-resolver-types: "npm:9.3.0-release52.0"
11951195
tslib: "npm:^2.8.1"
11961196
type-fest: "npm:^4.33.0"
11971197
languageName: node
@@ -10234,12 +10234,12 @@ __metadata:
1023410234
languageName: node
1023510235
linkType: hard
1023610236

10237-
"timeline-state-resolver-types@npm:9.2.0-nightly-release52-20250204-101510-3576f2cd8.0":
10238-
version: 9.2.0-nightly-release52-20250204-101510-3576f2cd8.0
10239-
resolution: "timeline-state-resolver-types@npm:9.2.0-nightly-release52-20250204-101510-3576f2cd8.0"
10237+
"timeline-state-resolver-types@npm:9.3.0-release52.0":
10238+
version: 9.3.0-release52.0
10239+
resolution: "timeline-state-resolver-types@npm:9.3.0-release52.0"
1024010240
dependencies:
1024110241
tslib: "npm:^2.6.3"
10242-
checksum: 10/27a0950b04db1078325ec089e397b3f09336aea4b6926724e67564260042f689f4b002f27dbda0e1b81a5f66b02a54c7a99e234d0bb13aee921a07930e1c981c
10242+
checksum: 10/162d765cb3f3a673e284ed942aa355c7ab136f092989f28626f73def5f9878fdff763160e3372c8b5da681c9bfdaf104b02c4879bfadbd70fa699a8403920261
1024310243
languageName: node
1024410244
linkType: hard
1024510245

‎packages/blueprints-integration/CHANGELOG.md‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,39 @@
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-in-testing.0](https://github.com/nrkno/sofie-core/compare/v1.51.6...v1.52.0-in-testing.0) (2025-02-04)
7+
8+
9+
### Bug Fixes
10+
11+
* review comments ([752a30a](https://github.com/nrkno/sofie-core/commit/752a30a69ea4a864239a438b278c3b53d06a12a2))
12+
13+
14+
### Features
15+
16+
* add in-out words to the VT type ([7bec461](https://github.com/nrkno/sofie-core/commit/7bec4619836cb92ab85331afe130d0ed54ca976e))
17+
* add RemoteSpeak source layer type ([a9b98e7](https://github.com/nrkno/sofie-core/commit/a9b98e7a544f5dab90c6cc17713abbdc5b930744))
18+
* add segment timing countdownType ([9aaa2dd](https://github.com/nrkno/sofie-core/commit/9aaa2dd48e841177f32a8d16a2e6c37706c6c2ae))
19+
* allow adlib-actions to remove pieces from the current partInstance ([902e7ff](https://github.com/nrkno/sofie-core/commit/902e7fffe6cc23c48f7bd86e23595d83f74d84fa))
20+
* allow drag from mos-plugin to part ([d51ba2f](https://github.com/nrkno/sofie-core/commit/d51ba2fe8b8effa6037f379534b357d5320cc3c7))
21+
* config package manager from blueprints ([685364d](https://github.com/nrkno/sofie-core/commit/685364d5fd4af690a55292ba99ff8ecff386f893))
22+
* configure Core system/studio settings via blueprints ([ef14c8f](https://github.com/nrkno/sofie-core/commit/ef14c8f4f139be273ce8a8a3c21e6cc0f580d297))
23+
* configure peripheral device settings from blueprints ([878214b](https://github.com/nrkno/sofie-core/commit/878214bf983ed12fe82822b47b9c629727d4c20d))
24+
* customizable package status messages ([2ac7cb1](https://github.com/nrkno/sofie-core/commit/2ac7cb1eb95edc8f901168066396110b2cd71faa))
25+
* exclude pieces from part keepalive ([74bea6c](https://github.com/nrkno/sofie-core/commit/74bea6cf3a978410bc5e79b325a6fe8b0b190ba9))
26+
* list routesets from blueprints adlib action ([c228251](https://github.com/nrkno/sofie-core/commit/c22825130793c843f7290d3ee844b805bf2788f1))
27+
* meteor 3.0.4 ([8670727](https://github.com/nrkno/sofie-core/commit/8670727bba5ac9cffe0e5d36b4bd45d6664482be))
28+
* modify datastore in `onRundownActivate` SOFIE-3310 ([#1240](https://github.com/nrkno/sofie-core/issues/1240)) ([8a0759f](https://github.com/nrkno/sofie-core/commit/8a0759f610497e37493e8a798aa0dd13f4f57119))
29+
* move next part should respect quickloop bounds ([8f0153e](https://github.com/nrkno/sofie-core/commit/8f0153e294a4f4842e333cc3c4e2bacbf6c4c236))
30+
* processIngestData & userEditOperations ([e69a4fc](https://github.com/nrkno/sofie-core/commit/e69a4fc2f4e3d1e6c6b287e34a3b2f55080ce0c4))
31+
* quickloop improvements ([f1f77fa](https://github.com/nrkno/sofie-core/commit/f1f77fa11b50fe93afc50631988d7c2aa6306f13))
32+
* routeset config defined in blueprints ([e839b97](https://github.com/nrkno/sofie-core/commit/e839b97c0205df38e5bc7ab816a9c79406a7d767))
33+
* update meteor to 3.1 and node to 22 ([61b6854](https://github.com/nrkno/sofie-core/commit/61b6854261a03f04e81416b9d37ee995e3a10108))
34+
35+
36+
37+
38+
639
## [1.51.6](https://github.com/nrkno/sofie-core/compare/v1.51.5...v1.51.6) (2025-01-14)
740

841
**Note:** Version bump only for package @sofie-automation/blueprints-integration

‎packages/lerna.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.53.0-in-development",
3-
"npmClient": "yarn",
4-
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
5-
}
2+
"version": "1.53.0-in-development",
3+
"npmClient": "yarn",
4+
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
5+
}

‎packages/mos-gateway/CHANGELOG.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,27 @@
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-in-testing.0](https://github.com/nrkno/sofie-core/compare/v1.51.6...v1.52.0-in-testing.0) (2025-02-04)
7+
8+
9+
### Bug Fixes
10+
11+
* dis-/en-able heartbeat when openMediaHotStandby ([e2fe446](https://github.com/nrkno/sofie-core/commit/e2fe4467df8b578661c74c5755c110f730f3c3d4))
12+
* make openMediaHotStandby option pr subdevice, and rename from hotStandby to openMediaHotStandby ([ce68543](https://github.com/nrkno/sofie-core/commit/ce6854336f4df8fc4f4b512a3de1f039fc0f1309))
13+
* MosGateway hotstandby - send message for both servers if both connections are offline ([72c765f](https://github.com/nrkno/sofie-core/commit/72c765f56f4acf991bbb566fefb2b99106536587))
14+
* update mos-connection dependency (SOFIE-3006) ([#1251](https://github.com/nrkno/sofie-core/issues/1251)) ([d5c2cad](https://github.com/nrkno/sofie-core/commit/d5c2cad8e154703df2a9fb7698d54c35ef3f17f8))
15+
* update mos-connection dependency: fixes an issue where ExternalMetadata.MosPayload was not passed through if content is a string ([d499893](https://github.com/nrkno/sofie-core/commit/d4998939b463de518c7e12f32462cb77b6a40975))
16+
17+
18+
### Features
19+
20+
* meteor 3.0.4 ([8670727](https://github.com/nrkno/sofie-core/commit/8670727bba5ac9cffe0e5d36b4bd45d6664482be))
21+
* update meteor to 3.1 and node to 22 ([61b6854](https://github.com/nrkno/sofie-core/commit/61b6854261a03f04e81416b9d37ee995e3a10108))
22+
23+
24+
25+
26+
627
## [1.51.6](https://github.com/nrkno/sofie-core/compare/v1.51.5...v1.51.6) (2025-01-14)
728

829
**Note:** Version bump only for package mos-gateway

‎packages/playout-gateway/CHANGELOG.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,19 @@
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-in-testing.0](https://github.com/nrkno/sofie-core/compare/v1.51.6...v1.52.0-in-testing.0) (2025-02-04)
7+
8+
9+
### Features
10+
11+
* meteor 3.0.4 ([8670727](https://github.com/nrkno/sofie-core/commit/8670727bba5ac9cffe0e5d36b4bd45d6664482be))
12+
* modify datastore in `onRundownActivate` SOFIE-3310 ([#1240](https://github.com/nrkno/sofie-core/issues/1240)) ([8a0759f](https://github.com/nrkno/sofie-core/commit/8a0759f610497e37493e8a798aa0dd13f4f57119))
13+
* update meteor to 3.1 and node to 22 ([61b6854](https://github.com/nrkno/sofie-core/commit/61b6854261a03f04e81416b9d37ee995e3a10108))
14+
15+
16+
17+
18+
619
## [1.51.6](https://github.com/nrkno/sofie-core/compare/v1.51.5...v1.51.6) (2025-01-14)
720

821

‎packages/playout-gateway/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"@sofie-automation/shared-lib": "1.53.0-in-development",
6161
"debug": "^4.4.0",
6262
"influx": "^5.9.7",
63-
"timeline-state-resolver": "9.2.0-nightly-release52-20250204-101510-3576f2cd8.0",
63+
"timeline-state-resolver": "9.3.0-release52.0",
6464
"tslib": "^2.8.1",
6565
"underscore": "^1.13.7",
6666
"winston": "^3.17.0"

0 commit comments

Comments
 (0)