Skip to content

Commit df1fecc

Browse files
rodrigo-p-rodriguesrodrigo-p-rodrigues
authored
hotfix: replace mapfile logic because of macos runners (#1324)
2 parents 311c9c7 + 9c53fd1 commit df1fecc

4 files changed

Lines changed: 76 additions & 16 deletions

File tree

‎.github/workflows/scripts/check-existing-release.sh‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@ if git merge-base --is-ancestor "$merge_commit" origin/main; then
3232
# origin/main's tip instead of the immediate child of merge_commit. Fail loudly if the cap is
3333
# hit instead of guessing.
3434
ancestry_path_cap=1000
35-
mapfile -t ancestry_path < <(git rev-list --ancestry-path --reverse --max-count="$ancestry_path_cap" "${merge_commit}..origin/main")
35+
ancestry_path=()
36+
while IFS= read -r commit_sha; do
37+
ancestry_path+=("$commit_sha")
38+
done < <(git rev-list --ancestry-path --reverse --max-count="$ancestry_path_cap" "${merge_commit}..origin/main")
3639
if [[ "${#ancestry_path[@]}" -eq "$ancestry_path_cap" ]]; then
3740
echo "ERROR: more than $ancestry_path_cap commits between $merge_commit and origin/main; refusing to guess the immediate child commit." >&2
3841
exit 1

‎packages/suite-base/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
"css-loader": "6.8.1",
109109
"cytoscape": "3.31.1",
110110
"cytoscape-dagre": "2.5.0",
111-
"dompurify": "3.4.13",
111+
"dompurify": "3.4.15",
112112
"dotenv": "17.2.2",
113113
"esbuild-loader": "4.3.0",
114114
"eventemitter3": "5.0.1",
@@ -170,7 +170,7 @@
170170
"recharts": "2.15.3",
171171
"rehype-raw": "7.0.0",
172172
"reselect": "5.1.1",
173-
"sanitize-html": "2.17.5",
173+
"sanitize-html": "2.17.7",
174174
"seedrandom": "3.0.5",
175175
"shallowequal": "1.1.0",
176176
"storybook": "10.5.10",

‎packages/suite-desktop/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"@types/randomstring": "1.3.0",
2525
"@types/tinycolor2": "1.4.4",
2626
"@types/utif": "^3.0.6",
27-
"@xmldom/xmldom": "0.9.10",
27+
"@xmldom/xmldom": "0.9.12",
2828
"async-mutex": "0.5.0",
2929
"builder-util": "*",
3030
"clean-webpack-plugin": "4.0.0",

‎yarn.lock‎

Lines changed: 69 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3640,7 +3640,7 @@ __metadata:
36403640
css-loader: "npm:6.8.1"
36413641
cytoscape: "npm:3.31.1"
36423642
cytoscape-dagre: "npm:2.5.0"
3643-
dompurify: "npm:3.4.13"
3643+
dompurify: "npm:3.4.15"
36443644
dotenv: "npm:17.2.2"
36453645
esbuild-loader: "npm:4.3.0"
36463646
eventemitter3: "npm:5.0.1"
@@ -3702,7 +3702,7 @@ __metadata:
37023702
recharts: "npm:2.15.3"
37033703
rehype-raw: "npm:7.0.0"
37043704
reselect: "npm:5.1.1"
3705-
sanitize-html: "npm:2.17.5"
3705+
sanitize-html: "npm:2.17.7"
37063706
seedrandom: "npm:3.0.5"
37073707
shallowequal: "npm:1.1.0"
37083708
storybook: "npm:10.5.10"
@@ -3750,7 +3750,7 @@ __metadata:
37503750
"@types/randomstring": "npm:1.3.0"
37513751
"@types/tinycolor2": "npm:1.4.4"
37523752
"@types/utif": "npm:^3.0.6"
3753-
"@xmldom/xmldom": "npm:0.9.10"
3753+
"@xmldom/xmldom": "npm:0.9.12"
37543754
async-mutex: "npm:0.5.0"
37553755
builder-util: "npm:*"
37563756
clean-webpack-plugin: "npm:4.0.0"
@@ -10500,13 +10500,31 @@ __metadata:
1050010500
languageName: node
1050110501
linkType: hard
1050210502

10503+
"dom-serializer@npm:^3.0.0":
10504+
version: 3.1.1
10505+
resolution: "dom-serializer@npm:3.1.1"
10506+
dependencies:
10507+
domelementtype: "npm:^3.0.0"
10508+
domhandler: "npm:^6.0.0"
10509+
entities: "npm:^8.0.0"
10510+
checksum: 10/16004bf603b85a2e0b15c4d4b5ca162c4356053eb7d9845ae05e0411a0b56449ddf76fb46e3ae954d6b720a8cc9d71ae30c22c83272eeac0102eedb218a64c80
10511+
languageName: node
10512+
linkType: hard
10513+
1050310514
"domelementtype@npm:^2.0.1, domelementtype@npm:^2.2.0, domelementtype@npm:^2.3.0":
1050410515
version: 2.3.0
1050510516
resolution: "domelementtype@npm:2.3.0"
1050610517
checksum: 10/ee837a318ff702622f383409d1f5b25dd1024b692ef64d3096ff702e26339f8e345820f29a68bcdcea8cfee3531776b3382651232fbeae95612d6f0a75efb4f6
1050710518
languageName: node
1050810519
linkType: hard
1050910520

10521+
"domelementtype@npm:^3.0.0":
10522+
version: 3.0.0
10523+
resolution: "domelementtype@npm:3.0.0"
10524+
checksum: 10/6b5120222f7e8b3491ad2f00036a1a14965bccab91014bfa54fa7789081b71f88141bf3b5b264c75ca4916b08e16ac1233a4f3b38067acb3fca9a7b21327cec1
10525+
languageName: node
10526+
linkType: hard
10527+
1051010528
"domexception@npm:^1.0.1":
1051110529
version: 1.0.1
1051210530
resolution: "domexception@npm:1.0.1"
@@ -10534,6 +10552,15 @@ __metadata:
1053410552
languageName: node
1053510553
linkType: hard
1053610554

10555+
"domhandler@npm:^6.0.0":
10556+
version: 6.0.1
10557+
resolution: "domhandler@npm:6.0.1"
10558+
dependencies:
10559+
domelementtype: "npm:^3.0.0"
10560+
checksum: 10/370e7c121cf3223a5aa21ce03666189eebac8d5b16af83efc221a93ed4f6c7b9f2cf2cc92ef7d50cbbd05787e1fbad42ec3c4717f6eb578667280443b94ffe10
10561+
languageName: node
10562+
linkType: hard
10563+
1053710564
"dompurify@npm:3.4.11":
1053810565
version: 3.4.11
1053910566
resolution: "dompurify@npm:3.4.11"
@@ -10568,6 +10595,17 @@ __metadata:
1056810595
languageName: node
1056910596
linkType: hard
1057010597

10598+
"domutils@npm:^4.0.2":
10599+
version: 4.0.2
10600+
resolution: "domutils@npm:4.0.2"
10601+
dependencies:
10602+
dom-serializer: "npm:^3.0.0"
10603+
domelementtype: "npm:^3.0.0"
10604+
domhandler: "npm:^6.0.0"
10605+
checksum: 10/cb1e270d046225654c4333b45e87a316ecad2721113e92d3f8842795d93418bb0269bee024aad4793b494361e93b7b5e62b773926a89e46748db49df42acb38b
10606+
languageName: node
10607+
linkType: hard
10608+
1057110609
"dot-case@npm:^3.0.4":
1057210610
version: 3.0.4
1057310611
resolution: "dot-case@npm:3.0.4"
@@ -10865,6 +10903,13 @@ __metadata:
1086510903
languageName: node
1086610904
linkType: hard
1086710905

10906+
"entities@npm:^8.0.0":
10907+
version: 8.0.0
10908+
resolution: "entities@npm:8.0.0"
10909+
checksum: 10/d6e2ba75e444fb101ee2fbb07c839e687306c8a509426b75186619c19196f97c1db9932ca083f823c03e4a20e7407b654aa34de8cbb7770468e20fb2d4573a0e
10910+
languageName: node
10911+
linkType: hard
10912+
1086810913
"env-paths@npm:^2.2.0":
1086910914
version: 2.2.1
1087010915
resolution: "env-paths@npm:2.2.1"
@@ -12084,9 +12129,9 @@ __metadata:
1208412129
linkType: hard
1208512130

1208612131
"fflate@npm:~0.6.10":
12087-
version: 0.6.10
12088-
resolution: "fflate@npm:0.6.10"
12089-
checksum: 10/9f2fd7224bccdb28102adc7c55c262b584571426eb9e0b91b13088884f45700232b51e034e300b74abf64e5449596d5c37d0a802673e25edb17c6742e4a4a0bd
12132+
version: 0.6.11
12133+
resolution: "fflate@npm:0.6.11"
12134+
checksum: 10/84b7479c58f1162e6283ab5e2832acaf54f9a811559d48251aa87ffc18440d3105fca94bbf10683adda453573d3a00b1ac76205daa94f1d12f53798a301c922e
1209012135
languageName: node
1209112136
linkType: hard
1209212137

@@ -13307,7 +13352,7 @@ __metadata:
1330713352
languageName: node
1330813353
linkType: hard
1330913354

13310-
"htmlparser2@npm:^10.1, htmlparser2@npm:^10.1.0":
13355+
"htmlparser2@npm:^10.1":
1331113356
version: 10.1.0
1331213357
resolution: "htmlparser2@npm:10.1.0"
1331313358
dependencies:
@@ -13319,6 +13364,18 @@ __metadata:
1331913364
languageName: node
1332013365
linkType: hard
1332113366

13367+
"htmlparser2@npm:^12.0.0":
13368+
version: 12.0.0
13369+
resolution: "htmlparser2@npm:12.0.0"
13370+
dependencies:
13371+
domelementtype: "npm:^3.0.0"
13372+
domhandler: "npm:^6.0.0"
13373+
domutils: "npm:^4.0.2"
13374+
entities: "npm:^8.0.0"
13375+
checksum: 10/f5b29381f960fedd09e5b46cbb249d0506fb75bc46c572d6367de684da2adec8382cb9548ea1fcec2e84d0881f76a840397cfae732b7a2edac05f4280a1efc31
13376+
languageName: node
13377+
linkType: hard
13378+
1332213379
"htmlparser2@npm:^6.1.0":
1332313380
version: 6.1.0
1332413381
resolution: "htmlparser2@npm:6.1.0"
@@ -19286,18 +19343,18 @@ __metadata:
1928619343
languageName: node
1928719344
linkType: hard
1928819345

19289-
"sanitize-html@npm:2.17.5":
19290-
version: 2.17.5
19291-
resolution: "sanitize-html@npm:2.17.5"
19346+
"sanitize-html@npm:2.17.7":
19347+
version: 2.17.7
19348+
resolution: "sanitize-html@npm:2.17.7"
1929219349
dependencies:
1929319350
deepmerge: "npm:^4.2.2"
1929419351
escape-string-regexp: "npm:^4.0.0"
19295-
htmlparser2: "npm:^10.1.0"
19352+
htmlparser2: "npm:^12.0.0"
1929619353
is-plain-object: "npm:^5.0.0"
1929719354
launder: "npm:^1.7.1"
1929819355
parse-srcset: "npm:^1.0.2"
1929919356
postcss: "npm:^8.3.11"
19300-
checksum: 10/93c7ae236faa9bf281533394caebd5cbbc3e52349c1d82c32fb921826b65fcdab435238eee2931d70e9781f46be47c9e530909d258e239fa230f12496bfdc4f6
19357+
checksum: 10/8418fcfdabb4cb50569fa7a8af42cac2b4be0247b90b29bd4d7fff61363e78e41455b40397f2a1d084ef71d810b8d90f683d6b27084d3616b7b349ab98bd0e97
1930119358
languageName: node
1930219359
linkType: hard
1930319360

0 commit comments

Comments
 (0)