Skip to content

Commit ff3bb35

Browse files
authored
fix(GHSA-64g7-mvw6-v9qj): upgraded shelljs (#28)
Github Actions don't allow clearing the cache right now, it is planned for end of 2022, this is to force a cache miss and workaround the limitation: actions/cache#2 Upgrading both yarn and typescript to the next minor version because of a weird checksum mismatch on a typescript patch.
1 parent 7513e43 commit ff3bb35

File tree

6 files changed

+193
-160
lines changed

6 files changed

+193
-160
lines changed

.github/workflows/contracts-testing.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,9 @@ jobs:
2828
path: |
2929
~/.npm
3030
**/node_modules
31-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json', '**/yarn.lock') }}
31+
key: ${{ runner.os }}-build-${{ secrets.CACHE_VERSION }}-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json', '**/yarn.lock') }}
3232
restore-keys: |
33-
${{ runner.os }}-build-${{ env.cache-name }}-
34-
${{ runner.os }}-build-
35-
${{ runner.os }}-
33+
${{ runner.os }}-build-${{ secrets.CACHE_VERSION }}-${{ env.cache-name }}-
3634
3735
#- name: Install parent dependencies
3836
# run: |

.yarn/releases/yarn-3.1.0.cjs .yarn/releases/yarn-3.1.1.cjs

+150-150
Large diffs are not rendered by default.

.yarnrc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
nodeLinker: node-modules
22

3-
yarnPath: .yarn/releases/yarn-3.1.0.cjs
3+
yarnPath: .yarn/releases/yarn-3.1.1.cjs

contracts/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,11 @@
4444
"hardhat-watcher": "^2.1.1",
4545
"json-schema": "^0.4.0",
4646
"mocha": "^9.1.3",
47+
"shelljs": "0.8.5",
4748
"solhint": "^3.3.6",
4849
"solidity-coverage": "^0.7.17",
4950
"ts-node": "^10.4.0",
5051
"typechain": "^5.2.0",
51-
"typescript": "^4.4.4"
52+
"typescript": "^4.4.5"
5253
}
5354
}

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"subgraph",
1717
"web"
1818
],
19-
"packageManager": "[email protected].0",
19+
"packageManager": "[email protected].1",
2020
"volta": {
2121
"node": "16.13.0"
2222
},

yarn.lock

+37-3
Original file line numberDiff line numberDiff line change
@@ -1017,11 +1017,12 @@ __metadata:
10171017
hardhat-watcher: ^2.1.1
10181018
json-schema: ^0.4.0
10191019
mocha: ^9.1.3
1020+
shelljs: 0.8.5
10201021
solhint: ^3.3.6
10211022
solidity-coverage: ^0.7.17
10221023
ts-node: ^10.4.0
10231024
typechain: ^5.2.0
1024-
typescript: ^4.4.4
1025+
typescript: ^4.4.5
10251026
languageName: unknown
10261027
linkType: soft
10271028

@@ -13755,6 +13756,19 @@ __metadata:
1375513756
languageName: node
1375613757
linkType: hard
1375713758

13759+
"shelljs@npm:0.8.5":
13760+
version: 0.8.5
13761+
resolution: "shelljs@npm:0.8.5"
13762+
dependencies:
13763+
glob: ^7.0.0
13764+
interpret: ^1.0.0
13765+
rechoir: ^0.6.2
13766+
bin:
13767+
shjs: bin/shjs
13768+
checksum: 7babc46f732a98f4c054ec1f048b55b9149b98aa2da32f6cf9844c434b43c6251efebd6eec120937bd0999e13811ebd45efe17410edb3ca938f82f9381302748
13769+
languageName: node
13770+
linkType: hard
13771+
1375813772
"shelljs@npm:^0.8.3":
1375913773
version: 0.8.4
1376013774
resolution: "shelljs@npm:0.8.4"
@@ -15303,7 +15317,7 @@ __metadata:
1530315317
languageName: node
1530415318
linkType: hard
1530515319

15306-
"typescript@npm:^4.4.3, typescript@npm:^4.4.4":
15320+
"typescript@npm:^4.4.3":
1530715321
version: 4.4.4
1530815322
resolution: "typescript@npm:4.4.4"
1530915323
bin:
@@ -15313,7 +15327,17 @@ __metadata:
1531315327
languageName: node
1531415328
linkType: hard
1531515329

15316-
"typescript@patch:typescript@^4.4.3#~builtin<compat/typescript>, typescript@patch:typescript@^4.4.4#~builtin<compat/typescript>":
15330+
"typescript@npm:^4.4.5":
15331+
version: 4.5.5
15332+
resolution: "typescript@npm:4.5.5"
15333+
bin:
15334+
tsc: bin/tsc
15335+
tsserver: bin/tsserver
15336+
checksum: 506f4c919dc8aeaafa92068c997f1d213b9df4d9756d0fae1a1e7ab66b585ab3498050e236113a1c9e57ee08c21ec6814ca7a7f61378c058d79af50a4b1f5a5e
15337+
languageName: node
15338+
linkType: hard
15339+
15340+
"typescript@patch:typescript@^4.4.3#~builtin<compat/typescript>":
1531715341
version: 4.4.4
1531815342
resolution: "typescript@patch:typescript@npm%3A4.4.4#~builtin<compat/typescript>::version=4.4.4&hash=493e53"
1531915343
bin:
@@ -15323,6 +15347,16 @@ __metadata:
1532315347
languageName: node
1532415348
linkType: hard
1532515349

15350+
"typescript@patch:typescript@^4.4.5#~builtin<compat/typescript>":
15351+
version: 4.5.5
15352+
resolution: "typescript@patch:typescript@npm%3A4.5.5#~builtin<compat/typescript>::version=4.5.5&hash=493e53"
15353+
bin:
15354+
tsc: bin/tsc
15355+
tsserver: bin/tsserver
15356+
checksum: c05c318d79c690f101d7ffb34cd6c7d6bbd884d3af9cefe7749ad0cd6be43c7082f098280982ca945dcba23fde34a08fed9602bb26540936baf8c0520727d3ba
15357+
languageName: node
15358+
linkType: hard
15359+
1532615360
"typewise-core@npm:^1.2, typewise-core@npm:^1.2.0":
1532715361
version: 1.2.0
1532815362
resolution: "typewise-core@npm:1.2.0"

0 commit comments

Comments
 (0)