Skip to content

Commit af59bc1

Browse files
committed
Merge branch 'release53' into bbc-release53
2 parents 5f5e5c5 + 8b07493 commit af59bc1

File tree

124 files changed

+3729
-1548
lines changed

Some content is hidden

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

124 files changed

+3729
-1548
lines changed

.github/actions/setup-meteor/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ description: "Setup Meteor"
33
runs:
44
using: "composite"
55
steps:
6-
- run: curl "https://install.meteor.com/?release=3.1.2" | sh
6+
- run: curl "https://install.meteor.com/?release=3.3.2" | sh
77
shell: bash

.github/workflows/audit.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
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
@@ -45,7 +45,7 @@ jobs:
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
@@ -88,7 +88,7 @@ jobs:
8888
with:
8989
persist-credentials: false
9090
- name: Use Node.js
91-
uses: actions/setup-node@v4
91+
uses: actions/setup-node@v6
9292
with:
9393
node-version-file: ".node-version"
9494
- name: Prepare Environment
@@ -121,7 +121,7 @@ jobs:
121121
with:
122122
persist-credentials: false
123123
- name: Use Node.js
124-
uses: actions/setup-node@v4
124+
uses: actions/setup-node@v6
125125
with:
126126
node-version-file: ".node-version"
127127
- name: Prepare Environment

.github/workflows/node.yaml

Lines changed: 14 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
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
@@ -61,7 +61,7 @@ jobs:
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
@@ -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.32.0
255+
uses: aquasecurity/trivy-action@0.33.1
256256
env:
257257
TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
258258
with:
@@ -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.32.0
408+
uses: aquasecurity/trivy-action@0.33.1
409409
env:
410410
TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
411411
with:
@@ -453,7 +453,7 @@ jobs:
453453
with:
454454
persist-credentials: false
455455
- name: Use Node.js
456-
uses: actions/setup-node@v4
456+
uses: actions/setup-node@v6
457457
with:
458458
node-version-file: ".node-version"
459459
- name: restore node_modules
@@ -525,7 +525,7 @@ jobs:
525525
with:
526526
persist-credentials: false
527527
- name: Use Node.js ${{ matrix.node-version }}
528-
uses: actions/setup-node@v4
528+
uses: actions/setup-node@v6
529529
with:
530530
node-version: ${{ matrix.node-version }}
531531
- name: restore node_modules
@@ -565,7 +565,7 @@ jobs:
565565
with:
566566
persist-credentials: false
567567
- name: Use Node.js
568-
uses: actions/setup-node@v4
568+
uses: actions/setup-node@v6
569569
with:
570570
node-version-file: ".node-version"
571571
- name: Prepare Environment
@@ -595,7 +595,7 @@ jobs:
595595
with:
596596
persist-credentials: false
597597
- name: Use Node.js
598-
uses: actions/setup-node@v4
598+
uses: actions/setup-node@v6
599599
with:
600600
node-version-file: ".node-version"
601601
- name: Prepare Environment
@@ -631,7 +631,7 @@ jobs:
631631
with:
632632
persist-credentials: false
633633
- name: Use Node.js
634-
uses: actions/setup-node@v4
634+
uses: actions/setup-node@v6
635635
with:
636636
node-version-file: ".node-version"
637637
- name: restore node_modules
@@ -669,91 +669,7 @@ jobs:
669669
with:
670670
github_token: ${{ secrets.GITHUB_TOKEN }}
671671
publish_dir: ./packages/documentation/build
672-
673-
release-libs:
674-
name: Release Lib
675-
runs-on: ubuntu-latest
676-
timeout-minutes: 15
677-
678-
# only run for tags
679-
if: contains(github.ref, 'refs/tags/')
680-
681-
needs:
682-
- test-packages
683-
# core must be published first
684-
- build-core
685-
686-
steps:
687-
- uses: actions/checkout@v5
688-
with:
689-
persist-credentials: false
690-
- name: Use Node.js
691-
uses: actions/setup-node@v4
692-
with:
693-
node-version-file: ".node-version"
694-
- name: Prepare Environment # have to run this first to make sure the semver lib is available
695-
run: |
696-
corepack enable
697-
698-
yarn config set cacheFolder /home/runner/release-libs-cache
699-
700-
cd packages
701-
yarn install
702-
env:
703-
CI: true
704-
- name: Check release is desired
705-
id: do-publish
706-
run: |
707-
if [ -z "${{ secrets.NPM_TOKEN }}" ]; then
708-
echo "No Token"
709-
else
710-
# make dependencies of `determine-npm-tag` available
711-
yarn install --mode=skip-build
712-
713-
cd packages
714-
PACKAGE_NAME="@sofie-automation/shared-lib"
715-
PUBLISHED_VERSION=$(yarn npm info --json $PACKAGE_NAME | jq -c '.version' -r)
716-
THIS_VERSION=$(node -p "require('./lerna.json').version")
717-
NPM_TAG=$(node ../scripts/determine-npm-tag.js $PUBLISHED_VERSION $THIS_VERSION)
718-
719-
echo "Publishing $NPM_TAG"
720-
echo "tag=$NPM_TAG" >> $GITHUB_OUTPUT
721-
722-
fi
723-
- name: Build
724-
if: ${{ steps.do-publish.outputs.tag }}
725-
run: |
726-
cd packages
727-
yarn build
728-
env:
729-
CI: true
730-
- name: Build OpenAPI client library
731-
if: ${{ steps.do-publish.outputs.tag }}
732-
run: |
733-
cd packages/openapi
734-
yarn build
735-
env:
736-
CI: true
737-
- name: Modify dependencies to use npm packages
738-
run: node scripts/prepublish.js
739-
- name: Publish to NPM
740-
if: ${{ steps.do-publish.outputs.tag }}
741-
run: |
742-
echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ~/.npmrc
743-
744-
# hack as it can sometimes have unexpected changes
745-
git checkout .yarnrc.yml
746-
747-
cd packages
748-
git checkout .yarnrc.yml
749-
750-
yarn lerna publish from-package --tag-version-prefix='' --dist-tag ${{ steps.do-publish.outputs.tag }} --yes --no-verify-access
751-
752-
NEW_VERSION=$(node -p "require('./package.json').version")
753-
echo "version=$NEW_VERSION" >> $GITHUB_OUTPUT
754-
echo "**Published:** $NEW_VERSION" >> $GITHUB_STEP_SUMMARY
755-
env:
756-
CI: true
672+
force_orphan: true
757673

758674
check-for-multiple-library-versions:
759675
name: Check for multiple library versions
@@ -765,7 +681,7 @@ jobs:
765681
with:
766682
persist-credentials: false
767683
- name: Use Node.js
768-
uses: actions/setup-node@v4
684+
uses: actions/setup-node@v6
769685
with:
770686
node-version-file: ".node-version"
771687
- uses: ./.github/actions/setup-meteor
@@ -780,7 +696,7 @@ jobs:
780696
- name: Prepare Environment
781697
run: |
782698
corepack enable
783-
699+
784700
yarn config set cacheFolder /home/runner/check-for-multiple-library-versions-cache
785701
yarn
786702
env:

0 commit comments

Comments
 (0)