Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .azure-pipelines/azure-pipelines-osx.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions .azure-pipelines/azure-pipelines-win.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma9
github_actions_labels:
- cirun-openstack-cpu-large
- namespace-profile-16cpu-on-linux-64
icu:
- '78'
libsqlite:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ cxx_compiler:
cxx_compiler_version:
- '14'
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma9
- quay.io/condaforge/linux-anvil-aarch64:alma9
github_actions_labels:
- cirun-openstack-cpu-large
- namespace-profile-8cpu-on-linux-aarch64
icu:
- '78'
libsqlite:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.15'
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
brotli:
Expand All @@ -13,7 +13,7 @@ c_compiler_version:
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.15'
- '11.0'
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ cxx_compiler:
- clangxx
cxx_compiler_version:
- '19'
github_actions_labels:
- cirun-macos-m4-large
icu:
- '78'
libsqlite:
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/conda-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,17 @@ jobs:
matrix:
include:
- CONFIG: linux_64_
STORE_BUILD_ARTIFACTS: False
UPLOAD_PACKAGES: True
os: ubuntu
runs_on: ['cirun-openstack-cpu-large--${{ github.run_id }}-linux_64_']
runs_on: ['namespace-profile-16cpu-on-linux-64']
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
- CONFIG: linux_aarch64_
STORE_BUILD_ARTIFACTS: False
UPLOAD_PACKAGES: True
os: ubuntu
runs_on: ['cirun-openstack-cpu-large--${{ github.run_id }}-linux_aarch64_']
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
- CONFIG: osx_arm64_
UPLOAD_PACKAGES: True
os: macos
runs_on: ['cirun-macos-m4-large--${{ github.run_id }}-osx_arm64_']
runs_on: ['namespace-profile-8cpu-on-linux-aarch64']
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64:alma9
steps:

- name: Checkout code
Expand Down Expand Up @@ -108,7 +106,7 @@ jobs:
env:
# default value; make it explicit, as it needs to match with artefact
# generation below. Not configurable for now, can be revisited later
CONDA_BLD_DIR: C:\bld
CONDA_BLD_PATH: C:\bld
MINIFORGE_HOME: ${{ contains(runner.arch, 'ARM') && 'C' || 'D' }}:\Miniforge
PYTHONUNBUFFERED: 1
CONFIG: ${{ matrix.CONFIG }}
Expand Down
1 change: 1 addition & 0 deletions .gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions conda-forge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ bot:
- 22.x
automerge: true
build_platform:
linux_aarch64: linux_64
osx_arm64: osx_arm64
win_arm64: win_64
conda_build:
pkg_format: '2'
Expand All @@ -17,7 +15,6 @@ github:
branch_name: main
tooling_branch_name: main
github_actions:
self_hosted: true
triggers:
- push
- pull_request
Expand All @@ -26,5 +23,6 @@ linter:
- lint_stdlib
provider:
linux_64: github_actions
osx_arm64: github_actions
linux_aarch64: github_actions
osx_arm64: default
test: native_and_emulated
4 changes: 2 additions & 2 deletions pixi.toml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
c_stdlib_version: # [(osx and x86_64) or linux]
- '10.15' # [osx and x86_64]
c_stdlib_version: # [linux]
- "2.28" # [linux]
github_actions_labels: # [linux or (osx and arm64)]
- cirun-openstack-cpu-large # [linux]
- cirun-macos-m4-large # [osx and arm64]
github_actions_labels: # [linux]
- namespace-profile-16cpu-on-linux-64 # [linux64]
- namespace-profile-8cpu-on-linux-aarch64 # [linux and aarch64]

MACOSX_SDK_VERSION: # [osx and x86_64]
- "11.0" # [osx and x86_64]

Expand Down
8 changes: 4 additions & 4 deletions recipe/recipe.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
schema_version: 1

context:
version: "24.14.1"
version: "24.16.0"
# NODE_MODULE_VERSION set in src/node_version.h
NODE_MODULE_VERSION: 137

Expand All @@ -14,19 +14,19 @@ source:
- if: unix
then:
url: https://nodejs.org/dist/v${{ version }}/node-v${{ version }}.tar.gz
sha256: 8298cf1f5774093ca819f41b8dd392fd2cff058688b4d5c8805026352e2d31b3
sha256: f511d32e3876cb54fa6ddccaa8dd46649ae6ebe9e499c57531c5ca56e7ad4548
patches:
- patches/0001-stop-removing-librt.patch
- patches/0002-include-obj-name-in-shared-intermediate.patch
- patches/0003-Forward-ceilf-floorf.patch
- if: target_platform == "win-64"
then:
url: https://nodejs.org/dist/v${{ version }}/node-v${{ version }}-win-x64.zip
sha256: 6e50ce5498c0cebc20fd39ab3ff5df836ed2f8a31aa093cecad8497cff126d70
sha256: edaca9bd58ec8e92037dac4e877d52f6b8f430b81c18b57e264b4e2fb111cd56
- if: target_platform == "win-arm64"
then:
url: https://nodejs.org/dist/v${{ version }}/node-v${{ version }}-win-arm64.zip
sha256: a7b7c68490e4a8cde1921fe5a0cfb3001d53f9c839e416903e4f28e727b62f60
sha256: 14834611d4c6b3c06054e7007732b90474c16e0b32f395e05b55a571ef71c6d2

build:
number: 0
Expand Down