Skip to content

Commit 40389af

Browse files
nytaminnytamin
committed
Merge branch 'release52' into release53
# Conflicts: # CHANGELOG.md # CONTRIBUTING.md # meteor/server/api/playout/DOCS.md # packages/documentation/docs/for-developers/data-model.md # packages/documentation/docs/for-developers/device-integrations/intro.md # packages/documentation/docs/for-developers/libraries.md # packages/documentation/docs/user-guide/concepts-and-architecture.md # packages/documentation/docs/user-guide/faq.md # packages/documentation/docs/user-guide/features/api.md # packages/documentation/docs/user-guide/installation/installing-connections-and-additional-hardware/casparcg-server-installation.md # packages/documentation/docs/user-guide/installation/installing-input-gateway.md # packages/documentation/docs/user-guide/supported-devices.md # packages/shared-lib/package.json
2 parents 72a9211 + 2948cce commit 40389af

Some content is hidden

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

65 files changed

+247
-245
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
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
@@ -79,4 +79,4 @@ If they're not, please open the PR as a Draft.
7979
- [ ] PR is ready to be reviewed.
8080
- [ ] The functionality has been tested by the author.
8181
- [ ] Relevant unit tests has been added / updated.
82-
- [ ] 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/node.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ jobs:
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
@@ -290,8 +290,8 @@ jobs:
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
@@ -661,7 +661,7 @@ jobs:
661661
env:
662662
CI: true
663663
- name: Publish
664-
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
665665
uses: peaceiris/actions-gh-pages@v4
666666
with:
667667
github_token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/prune-container-images.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ name: "Prune container images"
33
on:
44
workflow_dispatch:
55
schedule:
6-
- cron: '12 14 * * *'
6+
- cron: "12 14 * * *"
77

88
jobs:
99
prune-container-images:
10-
if: ${{ github.repository_owner == 'nrkno' }}
11-
12-
uses: nrkno/sofie-github-workflows/.github/workflows/prune-container-images.yml@main
10+
if: ${{ github.repository_owner == 'Sofie-Automation' }}
11+
12+
uses: Sofie-Automation/sofie-github-workflows/.github/workflows/prune-container-images.yml@main
1313
strategy:
1414
max-parallel: 1
1515
matrix:
16-
repo: [ server-core, playout-gateway, mos-gateway ]
16+
repo: [server-core, playout-gateway, mos-gateway]
1717
with:
1818
dry-run: false
1919
prune-untagged: true

‎.github/workflows/prune-tags.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,35 +10,35 @@ on:
1010
description: Regex of tags to ignore
1111
simulation:
1212
type: boolean
13-
description: Simulate a run (don't delete tags)
13+
description: Simulate a run (don't delete tags)
1414
schedule:
15-
- cron: '0 0 * * 0'
15+
- cron: "0 0 * * 0"
1616

1717
jobs:
1818
prune-tags:
19-
if: ${{ github.repository_owner == 'nrkno' }}
20-
19+
if: ${{ github.repository_owner == 'Sofie-Automation' }}
20+
2121
name: Prune tags
2222
runs-on: ubuntu-latest
2323
timeout-minutes: 15
2424
steps:
2525
- name: Checkout repo with all tags
2626
uses: actions/checkout@v4
2727
with:
28-
fetch-depth: 0
28+
fetch-depth: 0
2929

3030
- name: Prune tags (scheduled)
3131
if: github.event_name == 'schedule'
32-
uses: nrkno/sofie-github-workflows/.github/actions/tag-pruner@tag-pruner-v1
32+
uses: Sofie-Automation/sofie-github-workflows/.github/actions/tag-pruner@tag-pruner-v1
3333
with:
3434
older-than: 30
3535
ignore: v[0-9]+\.[0-9]+\.[0-9]+.*
3636
simulation: false
3737

3838
- name: Prune tags (manual)
3939
if: github.event_name == 'workflow_dispatch'
40-
uses: nrkno/sofie-github-workflows/.github/actions/tag-pruner@tag-pruner-v1
40+
uses: Sofie-Automation/sofie-github-workflows/.github/actions/tag-pruner@tag-pruner-v1
4141
with:
4242
older-than: ${{ github.event.inputs.older-than }}
4343
ignore: ${{ github.event.inputs.ignore }}
44-
simulation: ${{ github.event.inputs.simulation }}
44+
simulation: ${{ github.event.inputs.simulation }}

0 commit comments

Comments
 (0)