Skip to content

Commit a673823

Browse files
committed
Merge branch 'main' into develop
# Conflicts: # .github/workflows/prune-container-images.yml # .github/workflows/publish-prerelease-docker.yaml # yarn.lock
2 parents fe98cce + db209de commit a673823

File tree

16 files changed

+60
-59
lines changed

16 files changed

+60
-59
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Bug Report 🐛
22
description: Use this if you've found a bug
3-
title: "Bug Report: [Short description of the bug]"
3+
title: 'Bug Report: [Short description of the bug]'
44
labels:
55
- 🐛bug
66

@@ -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/other.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Other Issue 🔧
22
description: Use this for other issues
3-
title: "Other: [Short description of the issue]"
3+
title: 'Other: [Short description of the issue]'
44
labels:
55
- Other
66

@@ -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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Question ❓
22
description: Use this if you have a question to the Sofie team
3-
title: "Question: [Short summary of the question]"
3+
title: 'Question: [Short summary of the question]'
44
labels:
55
- ❓ Question
66

@@ -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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Request for Comments ❗
22
description: Use this to initiate a discussion about a new feature or a larger change
3-
title: "RFC: [Short description of the feature/change]"
3+
title: 'RFC: [Short description of the feature/change]'
44
labels:
55
- RFC
66
- Contribution
@@ -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:
@@ -23,7 +23,7 @@ body:
2323
- type: textarea
2424
attributes:
2525
label: Use case
26-
description: "Please write some background information here, such as: What is your use case? What problem are you trying to solve?"
26+
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
2929

.github/PULL-REQUEST-TEMPLATE.md

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,38 @@
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 Me
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

15-
This is a:
15+
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 Instructions
35+
3436
<!--
3537
Please provide some instructions and other information for how to verify that the feature works.
3638
Examples:
@@ -39,11 +41,10 @@ Examples:
3941
* "This feature also affects 'feature X', so that needs to be tested for regressions as well."
4042
-->
4143

42-
4344
## Other Information
4445

45-
4646
## Status
47+
4748
<!--
4849
Before you open the PR, make sure the items below are done.
4950
If they're not, please open the PR as a Draft.
@@ -52,4 +53,4 @@ If they're not, please open the PR as a Draft.
5253
- [ ] PR is ready to be reviewed.
5354
- [ ] The functionality has been tested by the author.
5455
- [ ] Relevant unit tests has been added / updated.
55-
- [ ] Relevant documentation (code comments, [system documentation](https://nrkno.github.io/sofie-core/)) has been added / updated.
56+
- [ ] Relevant documentation (code comments, [system documentation](https://sofie-automation.github.io/sofie-core/)) has been added / updated.

.github/dependabot.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
version: 2
22
updates:
3-
- package-ecosystem: "github-actions"
4-
directory: "/"
3+
- package-ecosystem: 'github-actions'
4+
directory: '/'
55
schedule:
6-
interval: "weekly"
6+
interval: 'weekly'
77
reviewers:
8-
- "@nrkno/sofie-ops"
9-
- package-ecosystem: "npm"
10-
directory: "/"
8+
- '@Sofie-Automation/operations'
9+
- package-ecosystem: 'npm'
10+
directory: '/'
1111
schedule:
12-
interval: "weekly"
12+
interval: 'weekly'
1313
reviewers:
14-
- "@nrkno/sofie-ops"
14+
- '@Sofie-Automation/operations'
1515
# Only create security updates
1616
open-pull-requests-limit: 0

.github/workflows/build-windows.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
workflow_dispatch:
55
push:
66
branches:
7-
- master
7+
- main
88
- 'release**'
99
- 'test**'
1010
tags:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
prune-container-images:
10-
uses: nrkno/sofie-github-workflows/.github/workflows/prune-container-images.yml@main
10+
uses: Sofie-Automation/sofie-github-workflows/.github/workflows/prune-container-images.yml@main
1111
strategy:
1212
max-parallel: 1
1313
matrix:

.github/workflows/publish-prerelease-docker.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ jobs:
2525
- name: Determine if images should be published to DockerHub
2626
id: dockerhub
2727
run: |
28-
# check if a release branch, or master, or a tag
29-
if [[ "${{ github.ref }}" =~ ^refs/heads/release([0-9]+)$ || "${{ github.ref }}" == "refs/heads/master" || "${{ github.ref }}" == refs/tags/* ]]
28+
# check if a release branch, or main, or a tag
29+
if [[ "${{ github.ref }}" =~ ^refs/heads/release([0-9]+)$ || "${{ github.ref }}" == "refs/heads/main" || "${{ github.ref }}" == refs/tags/* ]]
3030
then
3131
DOCKERHUB_PUBLISH="1"
3232
else
@@ -147,7 +147,7 @@ jobs:
147147
with:
148148
runs-on: "['ubuntu-latest']"
149149
registry-url: ghcr.io
150-
name: nrkno/sofie-package-manager
150+
name: sofie-automation/sofie-package-manager
151151
# Don't actually push any images, this is just for trivy scanning for now
152152
push: false
153153
trivy-severity: 'CRITICAL'

.github/workflows/publish-prerelease.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
run: |
5959
if [ -z "${{ secrets.NPM_TOKEN }}" ]; then
6060
echo "No Token"
61-
elif [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
61+
elif [[ "${{ github.ref }}" == "refs/heads/main" ]]; then
6262
echo "Publish nightly"
6363
echo "publish=nightly" >> $GITHUB_OUTPUT
6464
else

0 commit comments

Comments
 (0)