Skip to content

Commit 2116569

Browse files
authored
Merge pull request #378 from xhochy/22.11.0
nodejs 22.11.0
2 parents f1df185 + 00d33da commit 2116569

13 files changed

+110
-76
lines changed

.azure-pipelines/azure-pipelines-osx.yml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.azure-pipelines/azure-pipelines-win.yml

+2-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.ci_support/linux_64_.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ c_stdlib:
77
c_stdlib_version:
88
- '2.28'
99
cdt_name:
10-
- cos7
10+
- conda
1111
channel_sources:
1212
- conda-forge
1313
channel_targets:
@@ -29,7 +29,5 @@ target_platform:
2929
zip_keys:
3030
- - c_compiler_version
3131
- cxx_compiler_version
32-
- - c_stdlib_version
33-
- cdt_name
3432
zlib:
3533
- '1'

.ci_support/linux_aarch64_.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ c_stdlib_version:
1111
cdt_arch:
1212
- aarch64
1313
cdt_name:
14-
- cos7
14+
- conda
1515
channel_sources:
1616
- conda-forge
1717
channel_targets:
@@ -33,7 +33,5 @@ target_platform:
3333
zip_keys:
3434
- - c_compiler_version
3535
- cxx_compiler_version
36-
- - c_stdlib_version
37-
- cdt_name
3836
zlib:
3937
- '1'

.ci_support/osx_64_.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
55
c_compiler:
66
- clang
77
c_compiler_version:
8-
- '17'
8+
- '18'
99
c_stdlib:
1010
- macosx_deployment_target
1111
c_stdlib_version:
@@ -17,7 +17,7 @@ channel_targets:
1717
cxx_compiler:
1818
- clangxx
1919
cxx_compiler_version:
20-
- '17'
20+
- '18'
2121
github_actions_labels:
2222
- cirun-openstack-cpu-large
2323
icu:

.ci_support/osx_arm64_.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
55
c_compiler:
66
- clang
77
c_compiler_version:
8-
- '17'
8+
- '18'
99
c_stdlib:
1010
- macosx_deployment_target
1111
c_stdlib_version:
@@ -17,7 +17,7 @@ channel_targets:
1717
cxx_compiler:
1818
- clangxx
1919
cxx_compiler_version:
20-
- '17'
20+
- '18'
2121
github_actions_labels:
2222
- cirun-openstack-cpu-large
2323
icu:

.github/workflows/conda-build.yml

+1-6
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,6 @@ jobs:
8787
fi
8888
./.scripts/run_osx_build.sh
8989
90-
- name: Install Miniconda for windows
91-
uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
92-
with:
93-
miniforge-version: latest
94-
if: matrix.os == 'windows'
95-
9690
- name: Build on windows
9791
shell: cmd
9892
run: |
@@ -101,6 +95,7 @@ jobs:
10195
set "sha=%GITHUB_SHA%"
10296
call ".scripts\run_win_build.bat"
10397
env:
98+
MINIFORGE_HOME: D:\Miniforge
10499
PYTHONUNBUFFERED: 1
105100
CONFIG: ${{ matrix.CONFIG }}
106101
CI: github_actions

.scripts/build_steps.sh

+9-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.scripts/run_osx_build.sh

+28-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.scripts/run_win_build.bat

+31-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

azure-pipelines.yml

+28-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build-locally.py

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

recipe/meta.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% set version = "22.9.0" %}
1+
{% set version = "22.11.0" %}
22

33
# NODE_MODULE_VERSION set in src/node_version.h
44
{% set NODE_MODULE_VERSION = 127 %}
@@ -10,9 +10,9 @@ package:
1010
source:
1111
# checksums from https://nodejs.org/dist/vX.Y.Z/SHASUMS256.txt.asc
1212
url: https://nodejs.org/dist/v{{ version }}/node-v{{ version }}.tar.gz # [unix]
13-
sha256: 296854aa1dca140b0462c2415637d0419e42af91114538a7e6fdf623971a6833 # [unix]
13+
sha256: 24e5130fa7bc1eaab218a0c9cb05e03168fa381bb9e3babddc6a11f655799222 # [unix]
1414
url: https://nodejs.org/dist/v{{ version }}/node-v{{ version }}-win-x64.zip # [win]
15-
sha256: 8af226c0aa71fefe5228e881f4b5c5d90a8b41c290b96f44f56990d8dc3fac1c # [win]
15+
sha256: 905373a059aecaf7f48c1ce10ffbd5334457ca00f678747f19db5ea7d256c236 # [win]
1616
patches:
1717
- patches/0001-stop-removing-librt.patch # [not win]
1818
- patches/0002-include-obj-name-in-shared-intermediate.patch # [not win]

0 commit comments

Comments
 (0)