diff --git a/prepare_vscode.sh b/prepare_vscode.sh index ba7023b..34ee453 100755 --- a/prepare_vscode.sh +++ b/prepare_vscode.sh @@ -13,8 +13,13 @@ cd vscode || exit # apply patches # patch -u src/vs/platform/update/electron-main/updateService.win32.ts -i ../patches/update-cache-path.patch -CHILD_CONCURRENCY=1 yarn --frozen-lockfile -yarn postinstall +if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then + CHILD_CONCURRENCY=1 yarn --frozen-lockfile --ignore-optional + npm_config_argv='{"original":["--ignore-optional"]}' yarn postinstall +else + CHILD_CONCURRENCY=1 yarn --frozen-lockfile + yarn postinstall +fi if [[ "$BUILDARCH" == *"arm"* ]]; then sed -i -z 's/,\n[^\n]*arm[^\n]*//' node_modules/vscode-sqlite3/binding.gyp diff --git a/win32-build.yml b/win32-build.yml index a2d9287..e67939f 100644 --- a/win32-build.yml +++ b/win32-build.yml @@ -1,12 +1,7 @@ steps: - task: NodeTool@0 inputs: - versionSpec: "12.13.0" -- script: | - choco install jq - displayName: 'install jq from choco' -- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2 - displayName: 'Install Yarn' + versionSpec: "12.14.1" - task: UsePythonVersion@0 displayName: 'Use Python 2.x' inputs: @@ -27,9 +22,6 @@ steps: filePath: 'check_tags.ps1' env: MAPPED_GITHUB_TOKEN: $(GITHUB_TOKEN) -- script: | - git -C vscode status - displayName: 'vscode status' - powershell: | bash ./build.sh displayName: 'go build it!'