Skip to content

Commit fdb3596

Browse files
JulusianJulusian
committed
Merge branch 'release52' into release53
2 parents b3332d4 + 9a0bbc6 commit fdb3596

File tree

39 files changed

+2281
-1090
lines changed

39 files changed

+2281
-1090
lines changed

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

755671
check-for-multiple-library-versions:
756672
name: Check for multiple library versions
@@ -762,7 +678,7 @@ jobs:
762678
with:
763679
persist-credentials: false
764680
- name: Use Node.js
765-
uses: actions/setup-node@v4
681+
uses: actions/setup-node@v6
766682
with:
767683
node-version-file: ".node-version"
768684
- uses: ./.github/actions/setup-meteor
@@ -777,7 +693,7 @@ jobs:
777693
- name: Prepare Environment
778694
run: |
779695
corepack enable
780-
696+
781697
yarn config set cacheFolder /home/runner/check-for-multiple-library-versions-cache
782698
yarn
783699
env:

0 commit comments

Comments
 (0)