search

aws / language-servers

AWS related Language Servers
Apache License 2.0
17 stars 15 forks source link

Fixed patching scriptfor windows #303

Closed aderende closed 1 month ago

aderende commented 1 month ago

Problem

patch script didn't work for windows

Solution

script is fixed, the fix is tested on windows laptop

License

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

viktorsaws commented 1 month ago

@aderende, how did you test this solution? I have just created new workflow to build project in Windows runner, and it fails on patching error (you can see full output here https://github.com/aws/language-servers/actions/runs/9550009740/job/26320974932?pr=307). I tried to setup project from scratch on my Windows laptop, and the same error occurred, so it's not specific to the runner.

npm error code 1
npm error path D:\a\language-servers\language-servers\server\aws-lsp-yaml
npm error command failed
npm error command C:\Windows\system32\cmd.exe /d /s /c node patchYamlPackage.js
npm error error: patch failed: node_modules/yaml-language-server/lib/esm/languageservice/services/yamlHover.js:16
npm error error: node_modules/yaml-language-server/lib/esm/languageservice/services/yamlHover.js: patch does not apply
npm error node:child_process:929
npm error     throw err;
npm error     ^
npm error
npm error Error: Command failed: git apply D:\a\language-servers\language-servers\server\aws-lsp-yaml/patches/markdown/yamlHover.esm.patch
npm error error: patch failed: node_modules/yaml-language-server/lib/esm/languageservice/services/yamlHover.js:16
npm error error: node_modules/yaml-language-server/lib/esm/languageservice/services/yamlHover.js: patch does not apply
npm error
npm error     at checkExecSyncError (node:child_process:890:11)
npm error     at execFileSync (node:child_process:926:15)
npm error     at getPatchProcCommand (D:\a\language-servers\language-servers\server\aws-lsp-yaml\patchYamlPackage.js:[43](https://github.com/aws/language-servers/actions/runs/9550009740/job/26320974932?pr=307#step:4:44):16)
npm error     at applyPatch (D:\a\language-servers\language-servers\server\aws-lsp-yaml\patchYamlPackage.js:59:27)
npm error     at D:\a\language-servers\language-servers\server\aws-lsp-yaml\patchYamlPackage.js:74:9
npm error     at FSReqCallback.readFileAfterClose [as oncomplete] (node:internal/fs/read_file_context:68:3) {
npm error   status: 1,
npm error   signal: null,
npm error   output: [
npm error     null,
npm error     '',
npm error     'error: patch failed: node_modules/yaml-language-server/lib/esm/languageservice/services/yamlHover.js:16\n' +
npm error       'error: node_modules/yaml-language-server/lib/esm/languageservice/services/yamlHover.js: patch does not apply\n'
npm error   ],
npm error   pid: 1860,
npm error   stdout: '',
npm error   stderr: 'error: patch failed: node_modules/yaml-language-server/lib/esm/languageservice/services/yamlHover.js:16\n' +
npm error     'error: node_modules/yaml-language-server/lib/esm/languageservice/services/yamlHover.js: patch does not apply\n'
npm error }
npm error
npm error Node.js v18.20.3