diff options
| author | Robo <hop2deep@gmail.com> | 2022-05-09 13:00:18 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-09 13:00:18 +0300 |
| commit | 3d7135a49f5afbadc6849cce343666eaa446ea66 (patch) | |
| tree | 21a89d4d1041abe2ae8cd704e7056a0ac95b9521 /build/azure-pipelines | |
| parent | d9e91c33351c051876c731485a0c47a5852b904b (diff) | |
ci: fix 32-bit builds of native modules (#149062)
* ci: fix 32-bit builds of native modules
* chore: bump distro
Diffstat (limited to 'build/azure-pipelines')
| -rw-r--r-- | build/azure-pipelines/linux/product-build-linux-client.yml | 10 | ||||
| -rw-r--r-- | build/azure-pipelines/win32/product-build-win32.yml | 8 |
2 files changed, 18 insertions, 0 deletions
diff --git a/build/azure-pipelines/linux/product-build-linux-client.yml b/build/azure-pipelines/linux/product-build-linux-client.yml index 9d0a3567159..817d34d88ab 100644 --- a/build/azure-pipelines/linux/product-build-linux-client.yml +++ b/build/azure-pipelines/linux/product-build-linux-client.yml @@ -104,6 +104,16 @@ steps: - script: | set -e export npm_config_arch=$(NPM_ARCH) + # node-gyp@9.0.0 shipped with node@16.15.0 starts using config.gypi + # from the custom headers path if dist-url option was set instead of + # using the config value from the process. Electron builds with pointer compression + # enabled for x64 and arm64, but incorrectly ships a single copy of config.gypi + # with v8_enable_pointer_compression option always set for all target architectures. + # We use the force_process_config option to use the config.gypi from the + # nodejs process executing npm for 32-bit architectures. + if [ "$NPM_ARCH" = "armv7l" ]; then + export npm_config_force_process_config="true" + fi if [ -z "$CC" ] || [ -z "$CXX" ]; then # Download clang based on chromium revision used by vscode diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml index 7a578fb4c7b..78367983406 100644 --- a/build/azure-pipelines/win32/product-build-win32.yml +++ b/build/azure-pipelines/win32/product-build-win32.yml @@ -86,6 +86,14 @@ steps: . build/azure-pipelines/win32/retry.ps1 $ErrorActionPreference = "Stop" $env:npm_config_arch="$(VSCODE_ARCH)" + # node-gyp@9.0.0 shipped with node@16.15.0 starts using config.gypi + # from the custom headers path if dist-url option was set instead of + # using the config value from the process. Electron builds with pointer compression + # enabled for x64 and arm64, but incorrectly ships a single copy of config.gypi + # with v8_enable_pointer_compression option always set for all target architectures. + # We use the force_process_config option to use the config.gypi from the + # nodejs process executing npm for 32-bit architectures. + if ('$(VSCODE_ARCH)' -eq 'ia32') { $env:npm_config_force_process_config="true" } $env:CHILD_CONCURRENCY="1" retry { exec { yarn --frozen-lockfile --check-files } } env: |