fix: resolve package.json merge conflict (core v3 on top of master)
Test Action / Smoke (macos / v9.15.5) (pull_request) Waiting to run
Test Action / Smoke (windows / v9.15.5) (pull_request) Waiting to run
Test Action / Standalone Windows self-update (PATH regression) (pull_request) Waiting to run
Test Action / Smoke (ubuntu / v9.15.5) (pull_request) Failing after 6s
Test Action / Manifest pin: devEngines onFail=download, exact (pull_request) Failing after 6s
Test Action / Cache store path matches install (#233): devEngines exact pnpm@10.33.0 (pull_request) Failing after 5s
Test Action / run_install (global) (pull_request) Failing after 5s
Test Action / Manifest pin: devEngines onFail=error, exact (#252) (pull_request) Failing after 6s
Test Action / run_install (null) (pull_request) Failing after 6s
Test Action / Manifest pin: packageManager pnpm@9.15.5 (#227) (pull_request) Failing after 6s
Test Action / Cache store path matches install (#233): packageManager pnpm@10.33.0 (pull_request) Failing after 9s
Test Action / Manifest pin: explicit version: pnpm_config_pm_on_fail not exported (pull_request) Failing after 10s
Test Action / Manifest pin: packageManager pnpm@10.33.0 (pull_request) Failing after 10s
Test Action / Smoke (ubuntu / v10.33.0) (pull_request) Failing after 12s
Test Action / Smoke (ubuntu / v9.15.5 / custom-dest) (pull_request) Failing after 12s
Test Action / Standalone mode (pull_request) Failing after 11s
Test Action / Manifest pin: devEngines onFail=error, range (#252) (pull_request) Failing after 12s
Test Action / Manifest pin: devEngines onFail=download, range (pull_request) Failing after 13s
Test Action / Cache store path matches install (#233): devEngines range >=10 <11 (pull_request) Failing after 12s
pr-check / check-dist (pull_request) Failing after 4s

This commit is contained in:
2026-09-24 15:04:59 +02:00
parent ad9396411d
commit 03948d1f93
3 changed files with 240 additions and 247 deletions
+237 -238
View File
File diff suppressed because one or more lines are too long
+1 -7
View File
@@ -7,15 +7,9 @@
"update-bootstrap": "node scripts/update-bootstrap.mjs"
},
"dependencies": {
<<<<<<< HEAD
"@actions/cache": "^4.1.0",
"@actions/core": "^3.0.0",
"@actions/exec": "^1.1.1",
=======
"@actions/cache": "^6.0.0",
"@actions/core": "^1.10.1",
"@actions/core": "^3.0.0",
"@actions/exec": "^3.0.0",
>>>>>>> origin/master
"@actions/glob": "^0.5.0",
"@types/expand-tilde": "^2.0.2",
"@types/node": "^22.0.0",
+2 -2
View File
@@ -12,8 +12,8 @@ importers:
specifier: ^6.0.0
version: 6.2.0
'@actions/core':
specifier: ^1.10.1
version: 1.11.1
specifier: ^3.0.0
version: 3.0.1
'@actions/exec':
specifier: ^3.0.0
version: 3.0.0