Skip to content

Commit 9a0bbc6

Browse files
committed
Merge branch 'main' into release52
2 parents 9e8ee71 + e98ca90 commit 9a0bbc6

Some content is hidden

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

43 files changed

+2206
-1035
lines changed

.github/workflows/audit.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ 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
18-
uses: actions/setup-node@v4
18+
uses: actions/setup-node@v6
1919
with:
2020
node-version-file: ".node-version"
2121
- uses: ./.github/actions/setup-meteor
@@ -41,11 +41,11 @@ 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
48-
uses: actions/setup-node@v4
48+
uses: actions/setup-node@v6
4949
with:
5050
node-version-file: ".node-version"
5151
- uses: ./.github/actions/setup-meteor
@@ -83,11 +83,11 @@ jobs:
8383
- live-status-gateway
8484

8585
steps:
86-
- uses: actions/checkout@v4
86+
- uses: actions/checkout@v5
8787
with:
8888
persist-credentials: false
8989
- name: Use Node.js
90-
uses: actions/setup-node@v4
90+
uses: actions/setup-node@v6
9191
with:
9292
node-version-file: ".node-version"
9393
- name: Prepare Environment
@@ -116,11 +116,11 @@ jobs:
116116
timeout-minutes: 15
117117

118118
steps:
119-
- uses: actions/checkout@v4
119+
- uses: actions/checkout@v5
120120
with:
121121
persist-credentials: false
122122
- name: Use Node.js
123-
uses: actions/setup-node@v4
123+
uses: actions/setup-node@v6
124124
with:
125125
node-version-file: ".node-version"
126126
- name: Prepare Environment

.github/workflows/node.yaml

Lines changed: 26 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ 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
23-
uses: actions/setup-node@v4
23+
uses: actions/setup-node@v6
2424
with:
2525
node-version-file: ".node-version"
2626
- uses: ./.github/actions/setup-meteor
@@ -57,11 +57,11 @@ 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
64-
uses: actions/setup-node@v4
64+
uses: actions/setup-node@v6
6565
with:
6666
node-version-file: ".node-version"
6767
- uses: ./.github/actions/setup-meteor
@@ -104,7 +104,7 @@ 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
@@ -161,7 +161,7 @@ jobs:
161161
type=raw,value=latest,enable={{is_default_branch}}
162162
- name: Use Node.js
163163
if: steps.check-build-and-push.outputs.enable == 'true'
164-
uses: actions/setup-node@v4
164+
uses: actions/setup-node@v6
165165
with:
166166
node-version-file: ".node-version"
167167
- uses: ./.github/actions/setup-meteor
@@ -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.31.0
255+
uses: aquasecurity/trivy-action@0.33.1
256256
env:
257257
TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
258258
with:
@@ -284,7 +284,7 @@ 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
@@ -340,7 +340,7 @@ jobs:
340340
type=ref,event=tag
341341
type=raw,value=latest,enable={{is_default_branch}}
342342
- name: Use Node.js
343-
uses: actions/setup-node@v4
343+
uses: actions/setup-node@v6
344344
if: steps.check-build-and-push.outputs.enable == 'true'
345345
with:
346346
node-version-file: ".node-version"
@@ -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.31.0
408+
uses: aquasecurity/trivy-action@0.33.1
409409
env:
410410
TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
411411
with:
@@ -448,11 +448,11 @@ jobs:
448448
- webui
449449

450450
steps:
451-
- uses: actions/checkout@v4
451+
- uses: actions/checkout@v5
452452
with:
453453
persist-credentials: false
454454
- name: Use Node.js
455-
uses: actions/setup-node@v4
455+
uses: actions/setup-node@v6
456456
with:
457457
node-version-file: ".node-version"
458458
- name: restore node_modules
@@ -516,11 +516,11 @@ jobs:
516516
send-coverage: true
517517

518518
steps:
519-
- uses: actions/checkout@v4
519+
- uses: actions/checkout@v5
520520
with:
521521
persist-credentials: false
522522
- name: Use Node.js ${{ matrix.node-version }}
523-
uses: actions/setup-node@v4
523+
uses: actions/setup-node@v6
524524
with:
525525
node-version: ${{ matrix.node-version }}
526526
- name: restore node_modules
@@ -546,8 +546,8 @@ jobs:
546546
env:
547547
CI: true
548548
- 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
549+
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'))))
550+
uses: codecov/codecov-action@v5
551551
env:
552552
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
553553

@@ -556,11 +556,11 @@ jobs:
556556
runs-on: ubuntu-latest
557557
timeout-minutes: 15
558558
steps:
559-
- uses: actions/checkout@v4
559+
- uses: actions/checkout@v5
560560
with:
561561
persist-credentials: false
562562
- name: Use Node.js
563-
uses: actions/setup-node@v4
563+
uses: actions/setup-node@v6
564564
with:
565565
node-version-file: ".node-version"
566566
- name: Prepare Environment
@@ -584,11 +584,11 @@ jobs:
584584
runs-on: ubuntu-latest
585585
timeout-minutes: 15
586586
steps:
587-
- uses: actions/checkout@v4
587+
- uses: actions/checkout@v5
588588
with:
589589
persist-credentials: false
590590
- name: Use Node.js
591-
uses: actions/setup-node@v4
591+
uses: actions/setup-node@v6
592592
with:
593593
node-version-file: ".node-version"
594594
- name: Prepare Environment
@@ -620,11 +620,11 @@ jobs:
620620
timeout-minutes: 15
621621

622622
steps:
623-
- uses: actions/checkout@v4
623+
- uses: actions/checkout@v5
624624
with:
625625
persist-credentials: false
626626
- name: Use Node.js
627-
uses: actions/setup-node@v4
627+
uses: actions/setup-node@v6
628628
with:
629629
node-version-file: ".node-version"
630630
- name: restore node_modules
@@ -662,103 +662,19 @@ jobs:
662662
with:
663663
github_token: ${{ secrets.GITHUB_TOKEN }}
664664
publish_dir: ./packages/documentation/build
665-
666-
release-libs:
667-
name: Release Lib
668-
runs-on: ubuntu-latest
669-
timeout-minutes: 15
670-
671-
# only run for tags
672-
if: contains(github.ref, 'refs/tags/')
673-
674-
needs:
675-
- test-packages
676-
# core must be published first
677-
- build-core
678-
679-
steps:
680-
- uses: actions/checkout@v4
681-
with:
682-
persist-credentials: false
683-
- name: Use Node.js
684-
uses: actions/setup-node@v4
685-
with:
686-
node-version-file: ".node-version"
687-
- name: Prepare Environment # have to run this first to make sure the semver lib is available
688-
run: |
689-
corepack enable
690-
691-
yarn config set cacheFolder /home/runner/release-libs-cache
692-
693-
cd packages
694-
yarn install
695-
env:
696-
CI: true
697-
- name: Check release is desired
698-
id: do-publish
699-
run: |
700-
if [ -z "${{ secrets.NPM_TOKEN }}" ]; then
701-
echo "No Token"
702-
else
703-
# make dependencies of `determine-npm-tag` available
704-
yarn install --mode=skip-build
705-
706-
cd packages
707-
PACKAGE_NAME="@sofie-automation/shared-lib"
708-
PUBLISHED_VERSION=$(yarn npm info --json $PACKAGE_NAME | jq -c '.version' -r)
709-
THIS_VERSION=$(node -p "require('./lerna.json').version")
710-
NPM_TAG=$(node ../scripts/determine-npm-tag.js $PUBLISHED_VERSION $THIS_VERSION)
711-
712-
echo "Publishing $NPM_TAG"
713-
echo "tag=$NPM_TAG" >> $GITHUB_OUTPUT
714-
715-
fi
716-
- name: Build
717-
if: ${{ steps.do-publish.outputs.tag }}
718-
run: |
719-
cd packages
720-
yarn build
721-
env:
722-
CI: true
723-
- name: Build OpenAPI client library
724-
if: ${{ steps.do-publish.outputs.tag }}
725-
run: |
726-
cd packages/openapi
727-
yarn build
728-
env:
729-
CI: true
730-
- name: Modify dependencies to use npm packages
731-
run: node scripts/prepublish.js
732-
- name: Publish to NPM
733-
if: ${{ steps.do-publish.outputs.tag }}
734-
run: |
735-
echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ~/.npmrc
736-
737-
# hack as it can sometimes have unexpected changes
738-
git checkout .yarnrc.yml
739-
740-
cd packages
741-
git checkout .yarnrc.yml
742-
743-
yarn lerna publish from-package --tag-version-prefix='' --dist-tag ${{ steps.do-publish.outputs.tag }} --yes --no-verify-access
744-
745-
NEW_VERSION=$(node -p "require('./package.json').version")
746-
echo "version=$NEW_VERSION" >> $GITHUB_OUTPUT
747-
echo "**Published:** $NEW_VERSION" >> $GITHUB_STEP_SUMMARY
748-
env:
749-
CI: true
665+
force_orphan: true
750666

751667
check-for-multiple-library-versions:
752668
name: Check for multiple library versions
753669
runs-on: ubuntu-latest
754670
continue-on-error: true
755671
timeout-minutes: 15
756672
steps:
757-
- uses: actions/checkout@v4
673+
- uses: actions/checkout@v5
758674
with:
759675
persist-credentials: false
760676
- name: Use Node.js
761-
uses: actions/setup-node@v4
677+
uses: actions/setup-node@v6
762678
with:
763679
node-version-file: ".node-version"
764680
- uses: ./.github/actions/setup-meteor
@@ -773,7 +689,7 @@ jobs:
773689
- name: Prepare Environment
774690
run: |
775691
corepack enable
776-
692+
777693
yarn config set cacheFolder /home/runner/check-for-multiple-library-versions-cache
778694
yarn
779695
env:

0 commit comments

Comments
 (0)