Skip to content

Commit e3a54ea

Browse files
committed
Merge remote-tracking branch 'upstream/release53' into upstream/fix-autoscroll-detaches-onair-line
2 parents 33b803e + 76dfbd2 commit e3a54ea

File tree

1,753 files changed

+51092
-38196
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,753 files changed

+51092
-38196
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @nrkno/sofieteam
1+
* @Sofie-Automation/maintainers

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ body:
1313
and to help the community to collaborate in troubleshooting and fixing them.
1414
1515
Before you post, be sure to read our Contribution guidelines:
16-
https://nrkno.github.io/sofie-core/docs/for-developers/contribution-guidelines
16+
https://sofie-automation.github.io/sofie-core//docs/for-developers/contribution-guidelines
1717
1818
- type: textarea
1919
attributes:

.github/ISSUE_TEMPLATE/other.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ body:
99
attributes:
1010
value: |
1111
Before you post, be sure to read our Contribution guidelines:
12-
https://nrkno.github.io/sofie-core/docs/for-developers/contribution-guidelines
12+
https://sofie-automation.github.io/sofie-core//docs/for-developers/contribution-guidelines
1313
1414
- type: textarea
1515
attributes:

.github/ISSUE_TEMPLATE/question.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ body:
99
attributes:
1010
value: |
1111
Before you post, be sure to read our Contribution guidelines:
12-
https://nrkno.github.io/sofie-core/docs/for-developers/contribution-guidelines
12+
https://sofie-automation.github.io/sofie-core//docs/for-developers/contribution-guidelines
1313
1414
- type: textarea
1515
attributes:

.github/ISSUE_TEMPLATE/rfc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ body:
1010
attributes:
1111
value: |
1212
Before you post, be sure to read our Contribution guidelines:
13-
https://nrkno.github.io/sofie-core/docs/for-developers/contribution-guidelines
13+
https://sofie-automation.github.io/sofie-core//docs/for-developers/contribution-guidelines
1414
1515
- type: textarea
1616
attributes:

.github/PULL-REQUEST-TEMPLATE.md

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,40 @@
11
<!--
22
Before you open a PR, be sure to read our Contribution guidelines:
3-
https://nrkno.github.io/sofie-core/docs/for-developers/contribution-guidelines
3+
https://sofie-automation.github.io/sofie-core//docs/for-developers/contribution-guidelines
44
-->
55

66
## About the Contributor
7+
78
<!--
89
Tell us who / which organization you are representing, and how the Sofie team will be able to contact you.
910
Example: "This pull request is posted on behalf of the NRK."
1011
-->
1112

12-
1313
## Type of Contribution
1414

1515
This is a:
16+
1617
<!-- (pick one) -->
17-
Bug fix / Feature / Code improvement / Documentation improvement / Other (please specify)
1818

19+
Bug fix / Feature / Code improvement / Documentation improvement / Other (please specify)
1920

2021
## Current Behavior
22+
2123
<!--
2224
Please describe how things worked before this PR.
2325
If it's a bug fixe: Describe the bug (what was happening?)
2426
-->
2527

26-
2728
## New Behavior
29+
2830
<!--
2931
What is the new behavior?
3032
-->
3133

32-
3334
## Testing
35+
3436
<!--
35-
When you add a feature, you should also provide relevant unit tests, in order to
37+
When you add a feature, you should also provide relevant unit tests, in order to
3638
* ensure that the feature works as expected
3739
* ensure that the feature will continue to work in the future
3840
-->
@@ -50,11 +52,11 @@ Examples:
5052
* This PR affects the playout logic in general.
5153
* This PR affects the timing calculation in the Rundown during playout.
5254
* This PR affects the NRC/MOS integration
53-
*
55+
*
5456
-->
5557

56-
5758
## Time Frame
59+
5860
<!--
5961
Please provide a note about the urgency or development plan for this PR.
6062
Example:
@@ -63,12 +65,12 @@ Example:
6365
* Not urgent, but we would like to get this merged into the in-development release.
6466
-->
6567

66-
6768
## Other Information
68-
<!-- The more information you can provide, the easier the pull request will be to merge -->
6969

70+
<!-- The more information you can provide, the easier the pull request will be to merge -->
7071

7172
## Status
73+
7274
<!--
7375
Before you open the PR, make sure the items below are done.
7476
If they're not, please open the PR as a Draft.
@@ -77,4 +79,4 @@ If they're not, please open the PR as a Draft.
7779
- [ ] PR is ready to be reviewed.
7880
- [ ] The functionality has been tested by the author.
7981
- [ ] Relevant unit tests has been added / updated.
80-
- [ ] Relevant documentation (code comments, [system documentation](https://nrkno.github.io/sofie-core/)) has been added / updated.
82+
- [ ] Relevant documentation (code comments, [system documentation](https://sofie-automation.github.io/sofie-core//)) has been added / updated.

.github/dependabot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ updates:
1111
open-pull-requests-limit: 0
1212
# Default reviewers
1313
reviewers:
14-
- "@nrkno/sofieteam"
14+
- "@Sofie-Automation/maintainers"
1515

1616
- package-ecosystem: "github-actions"
1717
# Workflow files stored in the
@@ -20,4 +20,4 @@ updates:
2020
schedule:
2121
interval: "weekly"
2222
reviewers:
23-
- "@nrkno/sofie-ops"
23+
- "@Sofie-Automation/operations"

.github/workflows/audit.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
continue-on-error: true
1212
timeout-minutes: 15
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515
with:
1616
persist-credentials: false
1717
- name: Use Node.js
@@ -41,7 +41,7 @@ jobs:
4141
continue-on-error: true
4242
timeout-minutes: 15
4343
steps:
44-
- uses: actions/checkout@v4
44+
- uses: actions/checkout@v5
4545
with:
4646
persist-credentials: false
4747
- name: Use Node.js
@@ -78,12 +78,13 @@ jobs:
7878
- blueprints-integration
7979
- server-core-integration
8080
- shared-lib
81+
- live-status-gateway-api
8182
- playout-gateway
8283
- mos-gateway
8384
- live-status-gateway
8485

8586
steps:
86-
- uses: actions/checkout@v4
87+
- uses: actions/checkout@v5
8788
with:
8889
persist-credentials: false
8990
- name: Use Node.js
@@ -116,7 +117,7 @@ jobs:
116117
timeout-minutes: 15
117118

118119
steps:
119-
- uses: actions/checkout@v4
120+
- uses: actions/checkout@v5
120121
with:
121122
persist-credentials: false
122123
- name: Use Node.js

.github/workflows/node.yaml

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
continue-on-error: true
1717
timeout-minutes: 15
1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v5
2020
with:
2121
persist-credentials: false
2222
- name: Use Node.js
@@ -57,7 +57,7 @@ jobs:
5757
runs-on: ubuntu-latest
5858
timeout-minutes: 30
5959
steps:
60-
- uses: actions/checkout@v4
60+
- uses: actions/checkout@v5
6161
with:
6262
persist-credentials: false
6363
- name: Use Node.js
@@ -104,14 +104,14 @@ jobs:
104104
runs-on: ubuntu-latest
105105
timeout-minutes: 30
106106
steps:
107-
- uses: actions/checkout@v4
107+
- uses: actions/checkout@v5
108108
with:
109109
persist-credentials: false
110110
- name: Determine if images should be published to DockerHub
111111
id: dockerhub
112112
run: |
113-
# check if a release branch, or master, or a tag
114-
if [[ "${{ github.ref }}" =~ ^refs/heads/release([0-9]+)$ || "${{ github.ref }}" == "refs/heads/master" || "${{ github.ref }}" == refs/tags/* ]]
113+
# check if a release branch, or main, or a tag
114+
if [[ "${{ github.ref }}" =~ ^refs/heads/release([0-9]+)$ || "${{ github.ref }}" == "refs/heads/main" || "${{ github.ref }}" == refs/tags/* ]]
115115
then
116116
DOCKERHUB_PUBLISH="1"
117117
else
@@ -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.29.0
255+
uses: aquasecurity/trivy-action@0.32.0
256256
env:
257257
TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
258258
with:
@@ -284,14 +284,14 @@ jobs:
284284
gateway-name: [playout-gateway, mos-gateway, "live-status-gateway"]
285285

286286
steps:
287-
- uses: actions/checkout@v4
287+
- uses: actions/checkout@v5
288288
with:
289289
persist-credentials: false
290290
- name: Determine if images should be published to DockerHub
291291
id: dockerhub
292292
run: |
293-
# check if a release branch, or master, or a tag
294-
if [[ "${{ github.ref }}" =~ ^refs/heads/release([0-9]+)$ || "${{ github.ref }}" == "refs/heads/master" || "${{ github.ref }}" == "refs/tags/*" ]]
293+
# check if a release branch, or main, or a tag
294+
if [[ "${{ github.ref }}" =~ ^refs/heads/release([0-9]+)$ || "${{ github.ref }}" == "refs/heads/main" || "${{ github.ref }}" == "refs/tags/*" ]]
295295
then
296296
DOCKERHUB_PUBLISH="1"
297297
else
@@ -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.29.0
408+
uses: aquasecurity/trivy-action@0.32.0
409409
env:
410410
TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
411411
with:
@@ -446,9 +446,10 @@ jobs:
446446
- openapi
447447
- live-status-gateway
448448
- webui
449+
- live-status-gateway-api
449450

450451
steps:
451-
- uses: actions/checkout@v4
452+
- uses: actions/checkout@v5
452453
with:
453454
persist-credentials: false
454455
- name: Use Node.js
@@ -479,7 +480,7 @@ jobs:
479480
CI: true
480481

481482
test-packages:
482-
name: Test Package
483+
name: Test Package (main)
483484
runs-on: ubuntu-latest
484485
timeout-minutes: 15
485486

@@ -490,6 +491,7 @@ jobs:
490491
- blueprints-integration
491492
- server-core-integration
492493
- shared-lib
494+
# - live-status-gateway-api # no tests yet
493495
- openapi
494496
node-version: [22.x]
495497
include:
@@ -516,7 +518,7 @@ jobs:
516518
send-coverage: true
517519

518520
steps:
519-
- uses: actions/checkout@v4
521+
- uses: actions/checkout@v5
520522
with:
521523
persist-credentials: false
522524
- name: Use Node.js ${{ matrix.node-version }}
@@ -546,8 +548,8 @@ jobs:
546548
env:
547549
CI: true
548550
- name: Send coverage
549-
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'))))
550-
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
551553
env:
552554
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
553555

@@ -556,7 +558,7 @@ jobs:
556558
runs-on: ubuntu-latest
557559
timeout-minutes: 15
558560
steps:
559-
- uses: actions/checkout@v4
561+
- uses: actions/checkout@v5
560562
with:
561563
persist-credentials: false
562564
- name: Use Node.js
@@ -573,18 +575,20 @@ jobs:
573575
CI: true
574576
- name: Run generator
575577
run: |
576-
cd packages/live-status-gateway
578+
cd packages/live-status-gateway-api
577579
578580
yarn gendocs
579581
yarn genserver
582+
583+
yarn generate-schema-types
580584
env:
581585
CI: true
582586
openapi-generation:
583587
name: OpenAPI Generation
584588
runs-on: ubuntu-latest
585589
timeout-minutes: 15
586590
steps:
587-
- uses: actions/checkout@v4
591+
- uses: actions/checkout@v5
588592
with:
589593
persist-credentials: false
590594
- name: Use Node.js
@@ -620,7 +624,7 @@ jobs:
620624
timeout-minutes: 15
621625

622626
steps:
623-
- uses: actions/checkout@v4
627+
- uses: actions/checkout@v5
624628
with:
625629
persist-credentials: false
626630
- name: Use Node.js
@@ -657,7 +661,7 @@ jobs:
657661
env:
658662
CI: true
659663
- name: Publish
660-
if: github.ref == 'refs/heads/master' # always publish for just the master branch
664+
if: github.ref == 'refs/heads/main' # always publish for just the main branch
661665
uses: peaceiris/actions-gh-pages@v4
662666
with:
663667
github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -677,7 +681,7 @@ jobs:
677681
- build-core
678682

679683
steps:
680-
- uses: actions/checkout@v4
684+
- uses: actions/checkout@v5
681685
with:
682686
persist-credentials: false
683687
- name: Use Node.js
@@ -754,7 +758,7 @@ jobs:
754758
continue-on-error: true
755759
timeout-minutes: 15
756760
steps:
757-
- uses: actions/checkout@v4
761+
- uses: actions/checkout@v5
758762
with:
759763
persist-credentials: false
760764
- name: Use Node.js

0 commit comments

Comments
 (0)