Skip to content

Commit df429e6

Browse files
committed
Merge branch 'master' into release50
2 parents 1b5cb60 + 22ec576 commit df429e6

File tree

4 files changed

+35
-8
lines changed

4 files changed

+35
-8
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ body:
88
- type: markdown
99
attributes:
1010
value: |
11+
Thanks for considering to post a Bug Report!
12+
The Bug Reports are used to raise awareness of issues in the Sofie system,
13+
and to help the community to collaborate in troubleshooting and fixing them.
14+
1115
Before you post, be sure to read our Contribution guidelines:
1216
https://nrkno.github.io/sofie-core/docs/for-developers/contribution-guidelines
1317
@@ -48,3 +52,12 @@ body:
4852
Examples:
4953
* This is a blocker for us, we cannot use feature X until this is fixed.
5054
* Not a big issue for us, but it would be nice to have this fixed.
55+
56+
- type: textarea
57+
attributes:
58+
label: Level of Involvement
59+
description: Are you willing to contribute a fix for this yourself? Or are you just raising awareness?
60+
placeholder: |
61+
Examples:
62+
* I am willing to contribute a fix for this - if I get some guidance on what might be wrong.
63+
* Just raising awareness, I won't be able to contribute a fix myself.

.github/PULL-REQUEST-TEMPLATE.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Example: "This pull request is posted on behalf of the NRK."
1212

1313
## Type of Contribution
1414

15-
This is a:
15+
This is a:
1616
<!-- (pick one) -->
1717
Bug fix / Feature / Code improvement / Documentation improvement / Other (please specify)
1818

@@ -40,6 +40,16 @@ Examples:
4040
-->
4141

4242

43+
## Time Frame
44+
<!--
45+
Please provide a note about the urgency or development plan for this PR.
46+
Example:
47+
* This Bug Fix is critical for us, please review and merge it as soon as possible.
48+
* We intend to finish the development on this feature in two weeks time.
49+
* Not urgent, but we would like to get this merged into the in-development release.
50+
-->
51+
52+
4353
## Other Information
4454
<!-- The more information you can provide, the easier the pull request will be to merge -->
4555

.github/workflows/node.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@ jobs:
8282
CI: true
8383
- name: Send coverage
8484
if: ((github.event_name == 'pull_request') && (!startsWith(github.head_ref, 'release'))) || ((github.event_name == 'push') && (!startsWith(github.ref_name, 'release')))
85-
uses: codecov/codecov-action@v3
85+
uses: codecov/codecov-action@v4
86+
env:
87+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
8688

8789
build-core:
8890
# TODO - should this be dependant on tests or something passing if we are on a tag?
@@ -229,7 +231,7 @@ jobs:
229231
echo "image=$image" >> $GITHUB_OUTPUT
230232
- name: Trivy scanning
231233
if: steps.check-build-and-push.outputs.enable == 'true' && steps.check-ghcr.outputs.enable == 'true' && steps.ghcr-tag.outputs.tags != 0
232-
uses: aquasecurity/trivy-action@0.16.1
234+
uses: aquasecurity/trivy-action@0.17.0
233235
with:
234236
image-ref: "${{ steps.trivy-image.outputs.image }}"
235237
format: "table"
@@ -378,7 +380,7 @@ jobs:
378380
echo "image=$image" >> $GITHUB_OUTPUT
379381
- name: Trivy scanning
380382
if: steps.check-build-and-push.outputs.enable == 'true' && steps.check-ghcr.outputs.enable == 'true' && steps.ghcr-tag.outputs.tags != 0
381-
uses: aquasecurity/trivy-action@0.16.1
383+
uses: aquasecurity/trivy-action@0.17.0
382384
with:
383385
image-ref: "${{ steps.trivy-image.outputs.image }}"
384386
format: "table"
@@ -509,7 +511,9 @@ jobs:
509511
CI: true
510512
- name: Send coverage
511513
if: (matrix.node-version == '16.x' || matrix.send-coverage == true) && ((github.event_name == 'pull_request') && ((!startsWith(github.head_ref, 'release'))) || ((github.event_name == 'push') && (!startsWith(github.ref_name, 'release'))))
512-
uses: codecov/codecov-action@v3
514+
uses: codecov/codecov-action@v4
515+
env:
516+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
513517

514518
publish-docs:
515519
name: Publish Docs

.github/workflows/trivy.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ jobs:
1313
image: ["server-core", "playout-gateway", "mos-gateway"]
1414
steps:
1515
- name: Run Trivy vulnerability scanner (json)
16-
uses: aquasecurity/trivy-action@0.16.1
16+
uses: aquasecurity/trivy-action@0.17.0
1717
with:
1818
image-ref: ghcr.io/nrkno/sofie-core-${{ matrix.image }}:latest
1919
format: json
2020
output: '${{ matrix.image }}-trivy-scan-results.json'
2121

2222
- name: Run Trivy vulnerability scanner (table)
23-
uses: aquasecurity/trivy-action@0.16.1
23+
uses: aquasecurity/trivy-action@0.17.0
2424
with:
2525
image-ref: ghcr.io/nrkno/sofie-core-${{ matrix.image }}:latest
2626
output: '${{ matrix.image }}-trivy-scan-results.txt'
@@ -36,7 +36,7 @@ jobs:
3636
echo $CODE_BLOCK >> $GITHUB_STEP_SUMMARY
3737
3838
- name: Run Trivy in GitHub SBOM mode and submit results to Dependency Graph
39-
uses: aquasecurity/trivy-action@0.16.1
39+
uses: aquasecurity/trivy-action@0.17.0
4040
with:
4141
format: 'github'
4242
output: 'dependency-results-${{ matrix.image }}.sbom.json'

0 commit comments

Comments
 (0)