Skip to content

Commit 8a3e60c

Browse files
committed
Merge branch 'release51'
2 parents 6cd6825 + 3ef299f commit 8a3e60c

File tree

1,061 files changed

+64174
-45152
lines changed

Some content is hidden

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

1,061 files changed

+64174
-45152
lines changed

.github/ISSUE_TEMPLATE/rfc.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Request for Comments ❗
2-
description: Use this to initiate a discussion about a new feature or a larger change
2+
description: Use this to initiate a discussion about a new feature or a larger change.
33
title: "RFC: [Short description of the feature/change]"
44
labels:
55
- RFC
@@ -14,15 +14,15 @@ body:
1414
1515
- type: textarea
1616
attributes:
17-
label: About me
17+
label: About Me
1818
description: Tell us who / which organization you are representing, and how the Sofie team will be able to contact you.
1919
placeholder: Example "This RFC is posted on behalf of the NRK."
2020
validations:
2121
required: true
2222

2323
- type: textarea
2424
attributes:
25-
label: Use case
25+
label: Use Case
2626
description: "Please write some background information here, such as: What is your use case? What problem are you trying to solve?"
2727
validations:
2828
required: true

.github/actions/setup-meteor/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: "Setup Meteor"
33
runs:
44
using: "composite"
55
steps:
6-
- run: curl "https://install.meteor.com/?release=2.7.3" | sh
6+
- run: curl "https://install.meteor.com/?release=2.13.3" | sh
77
shell: bash
88
- run: meteor npm install -g yarn
99
shell: bash

.github/workflows/node.yaml

Lines changed: 77 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ jobs:
4242
- name: Run typecheck and linter
4343
run: |
4444
cd meteor
45+
46+
# setup zodern:types. No linters are setup, so this simply installs the packages
47+
meteor lint
48+
4549
meteor yarn ci:lint
4650
env:
4751
CI: true
@@ -77,6 +81,10 @@ jobs:
7781
- name: Run Tests
7882
run: |
7983
cd meteor
84+
85+
# setup zodern:types. No linters are setup, so this simply installs the packages
86+
meteor lint
87+
8088
NODE_OPTIONS="--max-old-space-size=6144" meteor yarn unitci --force-exit
8189
env:
8290
CI: true
@@ -463,7 +471,7 @@ jobs:
463471
- blueprints-integration
464472
- server-core-integration
465473
- shared-lib
466-
node-version: [14.x, 16.x, 18.x]
474+
node-version: [14.x, 16.x, 18.x, 20.x]
467475
include:
468476
# include additional configs, to run certain packages only for a certain version of node
469477
- node-version: 14.x
@@ -477,6 +485,8 @@ jobs:
477485
package-name: openapi
478486
- node-version: 18.x
479487
package-name: openapi
488+
- node-version: 20.x
489+
package-name: openapi
480490
# No tests for the gateways yet
481491
# - node-version: 18.x
482492
# package-name: playout-gateway
@@ -519,6 +529,64 @@ jobs:
519529
env:
520530
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
521531

532+
asyncapi-generation:
533+
name: AsyncAPI Generation
534+
runs-on: ubuntu-latest
535+
timeout-minutes: 15
536+
steps:
537+
- uses: actions/checkout@v4
538+
with:
539+
persist-credentials: false
540+
- name: Use Node.js
541+
uses: actions/setup-node@v4
542+
with:
543+
node-version-file: ".node-version"
544+
- name: Prepare Environment
545+
run: |
546+
cd packages
547+
yarn
548+
env:
549+
CI: true
550+
- name: Run generator
551+
run: |
552+
cd packages/live-status-gateway
553+
554+
yarn gendocs
555+
yarn genserver
556+
env:
557+
CI: true
558+
openapi-generation:
559+
name: OpenAPI Generation
560+
runs-on: ubuntu-latest
561+
timeout-minutes: 15
562+
steps:
563+
- uses: actions/checkout@v4
564+
with:
565+
persist-credentials: false
566+
- name: Use Node.js
567+
uses: actions/setup-node@v4
568+
with:
569+
node-version-file: ".node-version"
570+
- name: Prepare Environment
571+
run: |
572+
cd packages
573+
yarn
574+
env:
575+
CI: true
576+
- name: Build OpenAPI client library
577+
run: |
578+
cd packages/openapi
579+
yarn build
580+
env:
581+
CI: true
582+
- name: Generate OpenAPI docs and server
583+
run: |
584+
cd packages/openapi
585+
yarn gendocs
586+
yarn genserver
587+
env:
588+
CI: true
589+
522590
publish-docs:
523591
name: Publish Docs
524592
runs-on: ubuntu-latest
@@ -604,7 +672,7 @@ jobs:
604672
else
605673
# make dependencies of `determine-npm-tag` available
606674
yarn install --mode=skip-build
607-
675+
608676
cd packages
609677
PACKAGE_NAME="@sofie-automation/shared-lib"
610678
PUBLISHED_VERSION=$(yarn npm info --json $PACKAGE_NAME | jq -c '.version' -r)
@@ -622,6 +690,13 @@ jobs:
622690
yarn build
623691
env:
624692
CI: true
693+
- name: Build OpenAPI client library
694+
if: ${{ steps.do-publish.outputs.tag }}
695+
run: |
696+
cd packages/openapi
697+
yarn build
698+
env:
699+
CI: true
625700
- name: Modify dependencies to use npm packages
626701
run: node scripts/prepublish.js
627702
- name: Publish to NPM

.github/workflows/prerelease-libs.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- blueprints-integration
5454
- server-core-integration
5555
- shared-lib
56-
node-version: [14.x, 16.x, 18.x]
56+
node-version: [14.x, 16.x, 18.x, 20.x]
5757

5858
steps:
5959
- uses: actions/checkout@v4
@@ -131,6 +131,14 @@ jobs:
131131
yarn build
132132
env:
133133
CI: true
134+
135+
- name: Build OpenAPI client library
136+
if: ${{ steps.do-publish.outputs.publish }}
137+
run: |
138+
cd packages/openapi
139+
yarn build
140+
env:
141+
CI: true
134142
- name: Modify dependencies to use npm packages
135143
run: node scripts/prepublish.js
136144
- name: Publish to NPM

.github/workflows/sonar.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ jobs:
1212
sonarcloud:
1313
name: SonarCloud
1414
runs-on: ubuntu-latest
15-
if: ${{ github.repository_owner == 'nrkno' }}
15+
if: ${{ github.repository_owner == 'nrkno' && !github.event.pull_request.head.repo.fork }}
16+
timeout-minutes: 15
1617

1718
steps:
1819
- uses: actions/checkout@v4

.github/workflows/trivy.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ jobs:
1313
strategy:
1414
matrix:
1515
image: ["server-core", "playout-gateway", "mos-gateway"]
16+
timeout-minutes: 15
17+
1618
steps:
1719
- name: Run Trivy vulnerability scanner (json)
1820
uses: aquasecurity/[email protected]

DEVELOPER.md

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Follow these instructions to start up Sofie Core in development mode. (For produ
1919
### Prerequisites
2020

2121
- Install [Node.js](https://nodejs.org) 14 (using [nvm](https://github.com/nvm-sh/nvm) or [nvm-windows](https://github.com/coreybutler/nvm-windows) is the recommended way to install Node.js)
22-
- Install [Meteor](https://www.meteor.com/install) (`npm install --global meteor`)
22+
- Install [Meteor](https://www.meteor.com/install) (`npm install --global meteor@2`)
2323
- Install [Node.js](https://nodejs.org) 18 (using the same method you used above, you can uninstall node 14 if needed)
2424
- Install an older version of corepack (`npm install --global [email protected]`)
2525
- Enable [corepack](https://nodejs.org/api/corepack.html#corepack) (`corepack enable`) as administrator/root. If `corepack` is not found, you may need to install it first with `npm install --global corepack`
@@ -132,6 +132,30 @@ The resulting JSON file will be placed in `meteor/public/locales/xx`, where it w
132132

133133
Then submit this as a PR.
134134

135+
## Deprecations
136+
137+
### ConfigManifests
138+
139+
The ConfigManifests for Blueprints and Gateways was replaced with JSONSchema in R50.
140+
However, one usage by AdlibActions for their userDataManifest remains as this is not something we are actively using.
141+
142+
## Blueprint Migrations
143+
144+
In R49, a replacement flow was added consisting of `validateConfig` and `applyConfig`.
145+
It is no longer recommended to use the old migrations flow for showstyle and studio blueprints.
146+
147+
### ExpectedMediaItems
148+
149+
These are used for Media-manager which is no longer being developed.
150+
151+
### Blueprints: getPieceABSessionId & getTimelineObjectAbSessionId
152+
153+
With AB being a native concept supported by Sofie since R50, these are likely no longer useful to Blueprints.
154+
155+
### MongoQuery `fields` specifier
156+
157+
It is recommended to use `projection` instead, as it is functionally identical but follows recommended naming from mongodb.
158+
135159
## Other info
136160

137161
### Version-Numbering Scheme

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ This is the _Core_ application of the [**Sofie** TV Automation System](https://g
44

55
The _Core_ is a _Meteor/Node.JS_-based web server that serves the web GUIs as well as handling the business logic for the Sofie system.
66

7-
* [_Core_-specific Developer Info](DEVELOPER.md)
8-
7+
- [_Core_-specific Developer Info](DEVELOPER.md)
98

109
## General Sofie System Information
11-
* [_Sofie_ Documentation](https://nrkno.github.io/sofie-core/)
12-
* [_Sofie_ Releases](https://nrkno.github.io/sofie-core/releases)
13-
* [Contribution Guidelines](CONTRIBUTING.md)
14-
* [License](LICENSE)
10+
11+
- [_Sofie_ Documentation](https://nrkno.github.io/sofie-core/)
12+
- [_Sofie_ Releases](https://nrkno.github.io/sofie-core/releases)
13+
- [Contribution Guidelines](CONTRIBUTING.md)
14+
- [License](LICENSE)
1515

1616
---
1717

meteor/.meteor/packages

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,27 @@
1010

1111
[email protected] # Packages every Meteor app needs to have
1212
[email protected] # Packages for a great mobile UX
13-
mongo@1.15.0 # The database Meteor supports right now
14-
[email protected].11 # Reactive variable for tracker
13+
mongo@1.16.7 # The database Meteor supports right now
14+
[email protected].12 # Reactive variable for tracker
1515

16-
standard-minifier-css@1.8.1 # CSS minifier run for production mode
17-
[email protected].0 # JS minifier run for production mode
16+
standard-minifier-css@1.9.2 # CSS minifier run for production mode
17+
[email protected].1 # JS minifier run for production mode
1818
[email protected] # ECMAScript 5 compatibility for older browsers
19-
[email protected].2 # Enable ECMAScript2015+ syntax in app code
20-
typescript@4.5.4 # Enable TypeScript syntax in .ts and .tsx modules
19+
[email protected].7 # Enable ECMAScript2015+ syntax in app code
20+
typescript@4.9.4 # Enable TypeScript syntax in .ts and .tsx modules
2121
[email protected] # Server-side component of the `meteor shell` command
22-
[email protected].7 # Select when to allow use of the "modern" bundle
22+
[email protected].9 # Select when to allow use of the "modern" bundle
2323

2424
[email protected] # Define static page content in .html files
2525
react-meteor-data # React higher-order component for reactively tracking Meteor data
2626

27-
tracker@1.2.0 # Meteor's client-side reactive programming library
28-
27+
tracker@1.3.2 # Meteor's client-side reactive programming library
28+
2929
fourseven:scss
3030

31-
31+
3232
ostrio:meteor-root
33-
33+
3434

3535
36+
zodern:types

meteor/.meteor/release

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

0 commit comments

Comments
 (0)