Skip to content

Commit 0d2befe

Browse files
authored
Merge pull request #467 from xhochy/update-24.14.1
Update to Node.js 24.14.1
2 parents 4b93886 + f8a31ed commit 0d2befe

8 files changed

Lines changed: 38 additions & 34 deletions

File tree

.ci_support/win_64_.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
1-
c_compiler:
2-
- vs2022
3-
c_stdlib:
4-
- vs
51
channel_sources:
62
- conda-forge
73
channel_targets:
84
- conda-forge main
9-
cxx_compiler:
10-
- vs2022
115
target_platform:
126
- win-64

.ci_support/win_arm64_.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
1-
c_compiler:
2-
- vs2022
3-
c_stdlib:
4-
- vs
51
channel_sources:
62
- conda-forge
73
channel_targets:
84
- conda-forge main
9-
cxx_compiler:
10-
- vs2022
115
target_platform:
126
- win-arm64

.github/workflows/conda-build.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,23 @@ jobs:
1919
timeout-minutes: 360
2020
strategy:
2121
fail-fast: false
22+
max-parallel: 50
2223
matrix:
2324
include:
2425
- CONFIG: linux_64_
2526
UPLOAD_PACKAGES: True
2627
os: ubuntu
27-
runs_on: ['cirun-openstack-cpu-large--${{ github.run_id }}-linux_64_', 'linux', 'x64', 'self-hosted']
28+
runs_on: ['cirun-openstack-cpu-large--${{ github.run_id }}-linux_64_']
2829
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
2930
- CONFIG: linux_aarch64_
3031
UPLOAD_PACKAGES: True
3132
os: ubuntu
32-
runs_on: ['cirun-openstack-cpu-large--${{ github.run_id }}-linux_aarch64_', 'linux', 'x64', 'self-hosted']
33+
runs_on: ['cirun-openstack-cpu-large--${{ github.run_id }}-linux_aarch64_']
3334
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
3435
- CONFIG: osx_arm64_
3536
UPLOAD_PACKAGES: True
3637
os: macos
37-
runs_on: ['cirun-macos-m4-large--${{ github.run_id }}-osx_arm64_', 'macOS', 'arm64', 'self-hosted']
38+
runs_on: ['cirun-macos-m4-large--${{ github.run_id }}-osx_arm64_']
3839
steps:
3940

4041
- name: Checkout code
@@ -108,7 +109,7 @@ jobs:
108109
# default value; make it explicit, as it needs to match with artefact
109110
# generation below. Not configurable for now, can be revisited later
110111
CONDA_BLD_DIR: C:\bld
111-
MINIFORGE_HOME: D:\Miniforge
112+
MINIFORGE_HOME: ${{ contains(runner.arch, 'ARM') && 'C' || 'D' }}:\Miniforge
112113
PYTHONUNBUFFERED: 1
113114
CONFIG: ${{ matrix.CONFIG }}
114115
CI: github_actions

.scripts/build_steps.sh

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.scripts/run_docker_build.sh

Lines changed: 27 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build-locally.py

Lines changed: 0 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pixi.toml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

recipe/recipe.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
schema_version: 1
22

33
context:
4-
version: "24.14.0"
4+
version: "24.14.1"
55
# NODE_MODULE_VERSION set in src/node_version.h
66
NODE_MODULE_VERSION: 137
77

@@ -14,19 +14,19 @@ source:
1414
- if: unix
1515
then:
1616
url: https://nodejs.org/dist/v${{ version }}/node-v${{ version }}.tar.gz
17-
sha256: 852c73dd5b6ba15b231d036da6312dbcdabd6295adc3940586f3187b77731cf3
17+
sha256: 8298cf1f5774093ca819f41b8dd392fd2cff058688b4d5c8805026352e2d31b3
1818
patches:
1919
- patches/0001-stop-removing-librt.patch
2020
- patches/0002-include-obj-name-in-shared-intermediate.patch
2121
- patches/0003-Forward-ceilf-floorf.patch
2222
- if: target_platform == "win-64"
2323
then:
2424
url: https://nodejs.org/dist/v${{ version }}/node-v${{ version }}-win-x64.zip
25-
sha256: 313fa40c0d7b18575821de8cb17483031fe07d95de5994f6f435f3b345f85c66
25+
sha256: 6e50ce5498c0cebc20fd39ab3ff5df836ed2f8a31aa093cecad8497cff126d70
2626
- if: target_platform == "win-arm64"
2727
then:
2828
url: https://nodejs.org/dist/v${{ version }}/node-v${{ version }}-win-arm64.zip
29-
sha256: 88d36e8109736a2fa9bdc596f2cf507a3c52c69cdf96e54f8acd473ec14be853
29+
sha256: a7b7c68490e4a8cde1921fe5a0cfb3001d53f9c839e416903e4f28e727b62f60
3030

3131
build:
3232
number: 0

0 commit comments

Comments
 (0)