Skip to content

Commit 6d4028a

Browse files
authored
Merge pull request #466 from xhochy/update-22.22.2
Update to Node.js 22.22.2
2 parents 1ebda7d + 448e251 commit 6d4028a

11 files changed

Lines changed: 46 additions & 40 deletions

File tree

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

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

.ci_support/osx_64_.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
MACOSX_DEPLOYMENT_TARGET:
2-
- '11.0'
2+
- '10.15'
33
MACOSX_SDK_VERSION:
4-
- '11.0'
4+
- '10.15'
55
c_compiler:
66
- clang
77
c_compiler_version:
88
- '19'
99
c_stdlib:
1010
- macosx_deployment_target
1111
c_stdlib_version:
12-
- '11.0'
12+
- '10.15'
1313
channel_sources:
1414
- conda-forge
1515
channel_targets:

.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
steps:
3536

3637
- name: Checkout code
37-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
38+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3839

3940
- name: Build on Linux
4041
id: build-linux
@@ -104,7 +105,7 @@ jobs:
104105
# default value; make it explicit, as it needs to match with artefact
105106
# generation below. Not configurable for now, can be revisited later
106107
CONDA_BLD_DIR: C:\bld
107-
MINIFORGE_HOME: D:\Miniforge
108+
MINIFORGE_HOME: ${{ contains(runner.arch, 'ARM') && 'C' || 'D' }}:\Miniforge
108109
PYTHONUNBUFFERED: 1
109110
CONFIG: ${{ matrix.CONFIG }}
110111
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.

LICENSE.txt

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

build-locally.py

Lines changed: 1 addition & 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.

0 commit comments

Comments
 (0)