Skip to content

Commit f46056a

Browse files
nytaminnytamin
committed
Merge pull request Sofie-Automation#1362 from bbc:upstream/update-dependencies
chore: update dependencies # Conflicts: # packages/webui/package.json # packages/yarn.lock
2 parents 923096e + 3a7a95a commit f46056a

File tree

44 files changed

+20815
-17967
lines changed

Some content is hidden

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

44 files changed

+20815
-17967
lines changed

‎.github/workflows/audit.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ jobs:
2727
key: ${{ runner.os }}-${{ hashFiles('meteor/yarn.lock') }}-${{ hashFiles('meteor/.meteor/release') }}
2828
- name: Validate production dependencies for vulnerabilities and compatible licenses
2929
run: |
30+
corepack enable
31+
3032
yarn
3133
cd meteor
3234
yarn validate:prod-dependencies
@@ -55,6 +57,8 @@ jobs:
5557
key: ${{ runner.os }}-${{ hashFiles('meteor/yarn.lock') }}-${{ hashFiles('meteor/.meteor/release') }}
5658
- name: Validate production dependencies for vulnerabilities and compatible licenses
5759
run: |
60+
corepack enable
61+
5862
yarn
5963
cd meteor
6064
yarn run validate:all-dependencies
@@ -88,6 +92,8 @@ jobs:
8892
node-version-file: ".node-version"
8993
- name: Prepare Environment
9094
run: |
95+
corepack enable
96+
9197
cd packages
9298
yarn install
9399
env:
@@ -119,6 +125,8 @@ jobs:
119125
node-version-file: ".node-version"
120126
- name: Prepare Environment
121127
run: |
128+
corepack enable
129+
122130
cd packages
123131
yarn install
124132
env:

‎.github/workflows/node.yaml‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ jobs:
3434
key: ${{ runner.os }}-${{ hashFiles('yarn.lock', 'meteor/yarn.lock', 'meteor/.meteor/release', 'packages/yarn.lock') }}
3535
- name: Prepare Environment
3636
run: |
37+
corepack enable
38+
3739
yarn config set cacheFolder /home/runner/lint-core-cache
3840
yarn
3941
yarn build:packages
@@ -73,6 +75,8 @@ jobs:
7375
key: ${{ runner.os }}-${{ hashFiles('yarn.lock', 'meteor/yarn.lock', 'meteor/.meteor/release', 'packages/yarn.lock') }}
7476
- name: Prepare Environment
7577
run: |
78+
corepack enable
79+
7680
yarn config set cacheFolder /home/runner/test-core-cache
7781
yarn
7882
yarn build:packages
@@ -174,6 +178,8 @@ jobs:
174178
- name: Prepare Environment
175179
if: steps.check-build-and-push.outputs.enable == 'true'
176180
run: |
181+
corepack enable
182+
177183
yarn install
178184
- name: Build libs
179185
if: steps.check-build-and-push.outputs.enable == 'true'
@@ -348,6 +354,8 @@ jobs:
348354
- name: Build
349355
if: steps.check-build-and-push.outputs.enable == 'true'
350356
run: |
357+
corepack enable
358+
351359
cd packages
352360
yarn install
353361
yarn lerna run --scope \*\*/${{ matrix.gateway-name }} --include-dependencies --stream build
@@ -455,6 +463,8 @@ jobs:
455463
key: ${{ runner.os }}-${{ hashFiles('packages/yarn.lock') }}
456464
- name: Prepare Environment
457465
run: |
466+
corepack enable
467+
458468
cd packages
459469
yarn config set cacheFolder /home/runner/${{ matrix.package-name }}-cache
460470
yarn install
@@ -521,6 +531,8 @@ jobs:
521531
key: ${{ runner.os }}-${{ hashFiles('packages/yarn.lock') }}
522532
- name: Prepare Environment
523533
run: |
534+
corepack enable
535+
524536
cd packages
525537
yarn config set cacheFolder /home/runner/test-packages-cache
526538
yarn install
@@ -553,6 +565,8 @@ jobs:
553565
node-version-file: ".node-version"
554566
- name: Prepare Environment
555567
run: |
568+
corepack enable
569+
556570
cd packages
557571
yarn
558572
env:
@@ -579,6 +593,8 @@ jobs:
579593
node-version-file: ".node-version"
580594
- name: Prepare Environment
581595
run: |
596+
corepack enable
597+
582598
cd packages
583599
yarn
584600
env:
@@ -619,10 +635,12 @@ jobs:
619635
key: ${{ runner.os }}-${{ hashFiles('packages/yarn.lock') }}
620636
- name: Prepare Environment
621637
run: |
638+
corepack enable
639+
622640
cd packages
623641
yarn config set cacheFolder /home/runner/publish-docs-cache
624642
yarn install
625-
yarn build
643+
yarn build:all
626644
env:
627645
CI: true
628646
- name: Run docusaurus
@@ -668,6 +686,8 @@ jobs:
668686
node-version-file: ".node-version"
669687
- name: Prepare Environment # have to run this first to make sure the semver lib is available
670688
run: |
689+
corepack enable
690+
671691
yarn config set cacheFolder /home/runner/release-libs-cache
672692
673693
cd packages
@@ -752,6 +772,8 @@ jobs:
752772
key: ${{ runner.os }}-${{ hashFiles('yarn.lock', 'meteor/yarn.lock', 'meteor/.meteor/release', 'packages/yarn.lock') }}
753773
- name: Prepare Environment
754774
run: |
775+
corepack enable
776+
755777
yarn config set cacheFolder /home/runner/check-for-multiple-library-versions-cache
756778
yarn
757779
env:

‎.github/workflows/prerelease-libs.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ jobs:
2929
node-version-file: ".node-version"
3030
- name: Prepare Environment
3131
run: |
32+
corepack enable
33+
3234
cd packages
3335
yarn install
3436
yarn lerna run --scope \*\*/${{ matrix.package-name }} --include-dependencies --stream build
@@ -65,6 +67,8 @@ jobs:
6567
node-version: ${{ matrix.node-version }}
6668
- name: Prepare Environment
6769
run: |
70+
corepack enable
71+
6872
cd packages
6973
yarn install
7074
yarn lerna run --scope \*\*/${{ matrix.package-name }} --include-dependencies --stream build
@@ -105,6 +109,8 @@ jobs:
105109
- name: Prepare Environment
106110
if: ${{ steps.do-publish.outputs.publish }}
107111
run: |
112+
corepack enable
113+
108114
cd packages
109115
yarn install
110116
env:

‎.github/workflows/sonar.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ jobs:
3737
key: ${{ runner.os }}-${{ hashFiles('yarn.lock', 'meteor/yarn.lock', 'meteor/.meteor/release', 'packages/yarn.lock') }}
3838
- name: Prepare Environment
3939
run: |
40+
corepack enable
41+
4042
yarn
4143
yarn build:packages
4244
env:

‎.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs‎

Lines changed: 0 additions & 541 deletions
This file was deleted.

‎.yarn/plugins/@yarnpkg/plugin-version.cjs‎

Lines changed: 0 additions & 550 deletions
This file was deleted.

‎.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎.yarn/releases/yarn-3.5.0.cjs‎

Lines changed: 0 additions & 873 deletions
This file was deleted.

‎.yarnrc.yml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
1-
nodeLinker: node-modules
1+
compressionLevel: mixed
22

3-
plugins:
4-
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
5-
spec: "@yarnpkg/plugin-workspace-tools"
6-
- path: .yarn/plugins/@yarnpkg/plugin-version.cjs
7-
spec: "@yarnpkg/plugin-version"
8-
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
9-
spec: "@yarnpkg/plugin-interactive-tools"
3+
enableGlobalCache: false
104

11-
yarnPath: .yarn/releases/yarn-3.5.0.cjs
5+
nodeLinker: node-modules

‎meteor/.yarnrc.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
nodeLinker: node-modules
2-
# meteor's isobuild is incredibly picky and requires the deep node_modules structure for some packages
31
nmHoistingLimits: dependencies
2+
3+
nodeLinker: node-modules

0 commit comments

Comments
 (0)