Skip to content

Commit 4f48648

Browse files
committed
Merge remote-tracking branch 'origin/main' into feat/expose-persistent-playout-state
# Conflicts: # meteor/server/migration/X_X_X.ts
2 parents 75adb3a + 340898e commit 4f48648

File tree

329 files changed

+15310
-4464
lines changed

Some content is hidden

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

329 files changed

+15310
-4464
lines changed

.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/workflows/node.yaml

Lines changed: 14 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ jobs:
274274
echo "image=$image" >> $GITHUB_OUTPUT
275275
- name: Trivy scanning
276276
if: steps.check-build-and-push.outputs.enable == 'true' && steps.check-ghcr.outputs.enable == 'true' && steps.ghcr-tag.outputs.tags != 0
277-
uses: aquasecurity/trivy-action@0.33.1
277+
uses: aquasecurity/trivy-action@0.34.1
278278
env:
279279
TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
280280
with:
@@ -446,7 +446,7 @@ jobs:
446446
echo "image=$image" >> $GITHUB_OUTPUT
447447
- name: Trivy scanning
448448
if: steps.check-build-and-push.outputs.enable == 'true' && steps.check-ghcr.outputs.enable == 'true' && steps.ghcr-tag.outputs.tags != 0
449-
uses: aquasecurity/trivy-action@0.33.1
449+
uses: aquasecurity/trivy-action@0.34.1
450450
env:
451451
TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
452452
with:
@@ -467,29 +467,10 @@ jobs:
467467
echo $CODE_BLOCK >> $GITHUB_STEP_SUMMARY
468468
469469
lint-packages:
470-
name: Lint Package ${{ matrix.package-name }}
470+
name: Lint Packages
471471
runs-on: ubuntu-latest
472472
timeout-minutes: 15
473473

474-
strategy:
475-
fail-fast: false
476-
matrix:
477-
package-name:
478-
- blueprints-integration
479-
- server-core-integration
480-
- playout-gateway
481-
- mos-gateway
482-
- corelib
483-
- shared-lib
484-
- meteor-lib
485-
- job-worker
486-
- openapi
487-
- live-status-gateway
488-
- live-status-gateway-api
489-
include:
490-
- package-name: webui
491-
tsconfig-name: tsconfig.json
492-
493474
steps:
494475
- uses: actions/checkout@v6
495476
with:
@@ -498,30 +479,32 @@ jobs:
498479
uses: actions/setup-node@v6
499480
with:
500481
node-version-file: ".node-version"
482+
- uses: ./.github/actions/setup-meteor
501483
- name: restore node_modules
502484
uses: actions/cache@v5
503485
with:
504486
path: |
487+
node_modules
488+
meteor/node_modules
505489
packages/node_modules
506-
key: ${{ runner.os }}-${{ hashFiles('packages/yarn.lock') }}
490+
key: ${{ runner.os }}-${{ hashFiles('yarn.lock', 'meteor/yarn.lock', 'meteor/.meteor/release', 'packages/yarn.lock') }}
507491
- name: Prepare Environment
508492
run: |
509493
corepack enable
510494
511-
cd packages
512-
yarn config set cacheFolder /home/runner/${{ matrix.package-name }}-cache
495+
yarn config set cacheFolder /home/runner/publish-docs-cache
513496
yarn install
514497
515-
if [ "${{ matrix.package-name }}" = "openapi" ]; then
516-
yarn workspace @sofie-automation/openapi run build
517-
else
518-
yarn build:single ${{ matrix.package-name }}/${{ matrix.tsconfig-name || 'tsconfig.build.json' }}
519-
fi
498+
# setup zodern:types. No linters are setup, so this simply installs the packages
499+
yarn meteor lint
500+
501+
cd packages
502+
yarn build:all
520503
env:
521504
CI: true
522505
- name: Run typecheck and linter
523506
run: |
524-
cd packages/${{ matrix.package-name }}
507+
cd packages
525508
yarn lint
526509
env:
527510
CI: true

.github/workflows/publish-libs.yml

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
fi
4444
4545
lint-packages:
46-
name: Lint Lib
46+
name: Lint packages
4747
runs-on: ubuntu-latest
4848
continue-on-error: true
4949
timeout-minutes: 15
@@ -52,15 +52,6 @@ jobs:
5252

5353
if: ${{ needs.check-publish.outputs.can-publish == '1' }}
5454

55-
strategy:
56-
fail-fast: false
57-
matrix:
58-
package-name:
59-
- blueprints-integration
60-
- server-core-integration
61-
- shared-lib
62-
- live-status-gateway-api
63-
6455
steps:
6556
- uses: actions/checkout@v6
6657
with:
@@ -69,18 +60,24 @@ jobs:
6960
uses: actions/setup-node@v6
7061
with:
7162
node-version-file: ".node-version"
63+
- uses: ./.github/actions/setup-meteor
7264
- name: Prepare Environment
7365
run: |
7466
corepack enable
7567
76-
cd packages
68+
yarn config set cacheFolder /home/runner/publish-docs-cache
7769
yarn install
78-
yarn build:single ${{ matrix.package-name }}/tsconfig.build.json
70+
71+
# setup zodern:types. No linters are setup, so this simply installs the packages
72+
yarn meteor lint
73+
74+
cd packages
75+
yarn build:all
7976
env:
8077
CI: true
8178
- name: Run typecheck and linter
8279
run: |
83-
cd packages/${{ matrix.package-name }}
80+
cd packages
8481
yarn lint
8582
env:
8683
CI: true

.github/workflows/trivy.yml

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

2222
steps:
2323
- name: Run Trivy vulnerability scanner (json)
24-
uses: aquasecurity/trivy-action@0.33.1
24+
uses: aquasecurity/trivy-action@0.34.1
2525
env:
2626
TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
2727
with:
@@ -30,7 +30,7 @@ jobs:
3030
output: "${{ matrix.image }}-trivy-scan-results.json"
3131

3232
- name: Run Trivy vulnerability scanner (table)
33-
uses: aquasecurity/trivy-action@0.33.1
33+
uses: aquasecurity/trivy-action@0.34.1
3434
env:
3535
TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
3636
with:
@@ -48,7 +48,7 @@ jobs:
4848
echo $CODE_BLOCK >> $GITHUB_STEP_SUMMARY
4949
5050
- name: Run Trivy in GitHub SBOM mode and submit results to Dependency Graph
51-
uses: aquasecurity/trivy-action@0.33.1
51+
uses: aquasecurity/trivy-action@0.34.1
5252
env:
5353
TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
5454
with:

meteor/CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@
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+
## [26.3.0-2](https://github.com/Sofie-Automation/sofie-core/compare/v26.3.0-1...v26.3.0-2) (2026-02-18)
6+
7+
8+
### Bug Fixes
9+
10+
* Add missing 'rootDir' to tsconfig ([20e7d12](https://github.com/Sofie-Automation/sofie-core/commit/20e7d12aabdf4c9cf36f8a271435fce8aa253c2d))
11+
* missed projection values when executing adlib action ([#1648](https://github.com/Sofie-Automation/sofie-core/issues/1648)) ([af8a7d1](https://github.com/Sofie-Automation/sofie-core/commit/af8a7d19accdc74d3cc5909b1afefd3efeeb755c))
12+
13+
## [26.3.0-1](https://github.com/Sofie-Automation/sofie-core/compare/v26.3.0-0...v26.3.0-1) (2026-02-11)
14+
515
## [26.3.0-0](https://github.com/Sofie-Automation/sofie-core/compare/v1.52.0...v26.3.0-0) (2026-02-04)
616

717

meteor/__mocks__/defaultCollectionObjects.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,10 @@ export function defaultStudio(_id: StudioId): DBStudio {
116116
routeSetsWithOverrides: wrapDefaultObject({}),
117117
routeSetExclusivityGroupsWithOverrides: wrapDefaultObject({}),
118118
packageContainersWithOverrides: wrapDefaultObject({}),
119-
previewContainerIds: [],
120-
thumbnailContainerIds: [],
119+
packageContainerSettingsWithOverrides: wrapDefaultObject({
120+
previewContainerIds: [],
121+
thumbnailContainerIds: [],
122+
}),
121123
peripheralDeviceSettings: {
122124
deviceSettings: wrapDefaultObject({}),
123125
playoutDevices: wrapDefaultObject({}),

meteor/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "automation-core",
3-
"version": "26.3.0-0",
3+
"version": "26.3.0-2",
44
"private": true,
55
"engines": {
66
"node": ">=22.20.0"

meteor/server/__tests__/cronjobs.test.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -592,8 +592,10 @@ describe('cronjobs', () => {
592592
routeSetsWithOverrides: newObjectWithOverrides({}),
593593
routeSetExclusivityGroupsWithOverrides: newObjectWithOverrides({}),
594594
packageContainersWithOverrides: newObjectWithOverrides({}),
595-
previewContainerIds: [],
596-
thumbnailContainerIds: [],
595+
packageContainerSettingsWithOverrides: newObjectWithOverrides({
596+
previewContainerIds: [],
597+
thumbnailContainerIds: [],
598+
}),
597599
peripheralDeviceSettings: {
598600
deviceSettings: newObjectWithOverrides({}),
599601
ingestDevices: newObjectWithOverrides({}),

0 commit comments

Comments
 (0)