From 99372d087b4bac36ec35bd239470b70aabb729e4 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 25 Mar 2026 15:51:20 +0100 Subject: [PATCH 1/2] Update to 22.22.2 --- recipe/recipe.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipe/recipe.yaml b/recipe/recipe.yaml index 6ea5972..3f03904 100644 --- a/recipe/recipe.yaml +++ b/recipe/recipe.yaml @@ -1,7 +1,7 @@ schema_version: 1 context: - version: 22.22.0 + version: 22.22.2 # NODE_MODULE_VERSION set in src/node_version.h NODE_MODULE_VERSION: 127 @@ -14,7 +14,7 @@ source: - if: unix then: url: https://nodejs.org/dist/v${{ version }}/node-v${{ version }}.tar.gz - sha256: 5a4585d7f26bfb283267194b299243efea5ee6edd2fbf887825469b4ac94aece + sha256: f4b9606f33aef725a77b6292460102b48b80902571a8bb94cd769837ee0577df patches: - patches/0001-stop-removing-librt.patch - patches/0002-include-obj-name-in-shared-intermediate.patch @@ -22,11 +22,11 @@ source: - if: target_platform == "win-64" then: url: https://nodejs.org/dist/v${{ version }}/node-v${{ version }}-win-x64.zip - sha256: c97fa376d2becdc8863fcd3ca2dd9a83a9f3468ee7ccf7a6d076ec66a645c77a + sha256: 7c93e9d92bf68c07182b471aa187e35ee6cd08ef0f24ab060dfff605fcc1c57c - if: target_platform == "win-arm64" then: url: https://nodejs.org/dist/v${{ version }}/node-v${{ version }}-win-arm64.zip - sha256: 5b44fd410df7b4cd0a1891a05a7b606f8fb7d8786a94997b996a372e82478d7a + sha256: 380d375cf650c5a7f2ef3ce29ac6ea9a1c9d2ec8ea8e8391e1a34fd543886ab3 build: number: 0 From 448e25121c4be3a155a9959d20c62cc5e0afd98e Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 25 Mar 2026 15:51:22 +0100 Subject: [PATCH 2/2] MNT: Re-rendered with conda-smithy 3.58.0 and conda-forge-pinning 2026.03.25.06.06.53 Other tools: - conda-build 26.1.0 - rattler-build 0.61.2 - rattler-build-conda-compat 1.4.11 --- .azure-pipelines/azure-pipelines-osx.yml | 4 ++- .ci_support/osx_64_.yaml | 6 ++--- .ci_support/win_64_.yaml | 6 ----- .ci_support/win_arm64_.yaml | 6 ----- .github/workflows/conda-build.yml | 9 ++++--- .scripts/build_steps.sh | 1 + .scripts/run_docker_build.sh | 33 +++++++++++++++++++----- LICENSE.txt | 3 +-- build-locally.py | 8 +----- pixi.toml | 2 +- 10 files changed, 42 insertions(+), 36 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index d08eed2..bfe3727 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,15 +5,17 @@ jobs: - job: osx pool: - vmImage: macOS-15 + vmImage: $(VMIMAGE) strategy: matrix: osx_64_: CONFIG: osx_64_ UPLOAD_PACKAGES: 'True' + VMIMAGE: macOS-15 osx_arm64_: CONFIG: osx_arm64_ UPLOAD_PACKAGES: 'True' + VMIMAGE: macOS-15 timeoutInMinutes: 360 variables: {} diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 7d623e6..0187e44 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '11.0' +- '10.15' MACOSX_SDK_VERSION: -- '11.0' +- '10.15' c_compiler: - clang c_compiler_version: @@ -9,7 +9,7 @@ c_compiler_version: c_stdlib: - macosx_deployment_target c_stdlib_version: -- '11.0' +- '10.15' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index e78107f..e717348 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -1,12 +1,6 @@ -c_compiler: -- vs2022 -c_stdlib: -- vs channel_sources: - conda-forge channel_targets: - conda-forge main -cxx_compiler: -- vs2022 target_platform: - win-64 diff --git a/.ci_support/win_arm64_.yaml b/.ci_support/win_arm64_.yaml index 4f9e56b..df64257 100644 --- a/.ci_support/win_arm64_.yaml +++ b/.ci_support/win_arm64_.yaml @@ -1,12 +1,6 @@ -c_compiler: -- vs2022 -c_stdlib: -- vs channel_sources: - conda-forge channel_targets: - conda-forge main -cxx_compiler: -- vs2022 target_platform: - win-arm64 diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index a48bdf4..2fabb25 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -19,22 +19,23 @@ jobs: timeout-minutes: 360 strategy: fail-fast: false + max-parallel: 50 matrix: include: - CONFIG: linux_64_ UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-large--${{ github.run_id }}-linux_64_', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-cpu-large--${{ github.run_id }}-linux_64_'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONFIG: linux_aarch64_ UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-large--${{ github.run_id }}-linux_aarch64_', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-cpu-large--${{ github.run_id }}-linux_aarch64_'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 steps: - name: Checkout code - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - name: Build on Linux id: build-linux @@ -104,7 +105,7 @@ jobs: # 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 - MINIFORGE_HOME: D:\Miniforge + MINIFORGE_HOME: ${{ contains(runner.arch, 'ARM') && 'C' || 'D' }}:\Miniforge PYTHONUNBUFFERED: 1 CONFIG: ${{ matrix.CONFIG }} CI: github_actions diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 6831a52..c6ce254 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -20,6 +20,7 @@ export PYTHONUNBUFFERED=1 export RECIPE_ROOT="${RECIPE_ROOT:-/home/conda/recipe_root}" export CI_SUPPORT="${FEEDSTOCK_ROOT}/.ci_support" export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" +export RATTLER_CACHE_DIR="${FEEDSTOCK_ROOT}/build_artifacts/pkg_cache" cat >~/.condarc </dev/null && pwd )" PROVIDER_DIR="$(basename "$THISDIR")" @@ -27,7 +29,7 @@ if [[ "${sha:-}" == "" ]]; then popd fi -docker info +${DOCKER_EXECUTABLE} info # In order for the conda-build process in the container to write to the mounted # volumes, we need to run with the same id as the host machine, which is @@ -35,6 +37,7 @@ docker info export HOST_USER_ID=$(id -u) # Check if docker-machine is being used (normally on OSX) and get the uid from # the VM + if hash docker-machine 2> /dev/null && docker-machine active > /dev/null; then export HOST_USER_ID=$(docker-machine ssh $(docker-machine active) id -u) fi @@ -76,16 +79,34 @@ if [ -z "${CI}" ]; then DOCKER_RUN_ARGS="-it ${DOCKER_RUN_ARGS}" fi -( endgroup "Configure Docker" ) 2> /dev/null +# Default volume suffix for Docker (preserve original behavior) +VOLUME_SUFFIX=",z" +# Podman-specific handling +if [ "${DOCKER_EXECUTABLE}" = "podman" ]; then + # Fix file permissions for rootless podman builds + podman unshare chown -R ${HOST_USER_ID}:${HOST_USER_ID} "${ARTIFACTS}" + podman unshare chown -R ${HOST_USER_ID}:${HOST_USER_ID} "${RECIPE_ROOT}" + + # Add SELinux label only if enforcing + if command -v getenforce &>/dev/null && [ "$(getenforce)" = "Enforcing" ]; then + VOLUME_SUFFIX=",z" + else + VOLUME_SUFFIX="" + fi +fi + +( endgroup "Configure Docker" ) 2> /dev/null ( startgroup "Start Docker" ) 2> /dev/null export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" export IS_PR_BUILD="${IS_PR_BUILD:-False}" -docker pull "${DOCKER_IMAGE}" -docker run ${DOCKER_RUN_ARGS} \ - -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z,delegated \ - -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z,delegated \ + +${DOCKER_EXECUTABLE} pull "${DOCKER_IMAGE}" + +${DOCKER_EXECUTABLE} run ${DOCKER_RUN_ARGS} \ + -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw${VOLUME_SUFFIX},delegated \ + -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw${VOLUME_SUFFIX},delegated \ -e CONFIG \ -e HOST_USER_ID \ -e UPLOAD_PACKAGES \ diff --git a/LICENSE.txt b/LICENSE.txt index 2ec51d7..c5aa738 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,5 @@ BSD-3-Clause license -Copyright (c) 2015-2022, conda-forge contributors -All rights reserved. +Copyright (c) 2015-2026, conda-forge contributors Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/build-locally.py b/build-locally.py index 9dfe440..05493e4 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,5 +1,6 @@ #!/bin/sh """exec" "python3" "$0" "$@" #""" # fmt: off # fmt: on + # # This file has been generated by conda-smithy in order to build the recipe # locally. @@ -27,13 +28,6 @@ def setup_environment(ns): os.path.dirname(__file__), "miniforge3" ) - # The default cache location might not be writable using docker on macOS. - if ns.config.startswith("linux") and platform.system() == "Darwin": - os.environ["CONDA_FORGE_DOCKER_RUN_ARGS"] = ( - os.environ.get("CONDA_FORGE_DOCKER_RUN_ARGS", "") - + " -e RATTLER_CACHE_DIR=/tmp/rattler_cache" - ) - def run_docker_build(ns): script = ".scripts/run_docker_build.sh" diff --git a/pixi.toml b/pixi.toml index 6f141d7..a1b690e 100644 --- a/pixi.toml +++ b/pixi.toml @@ -5,7 +5,7 @@ [workspace] name = "nodejs-feedstock" -version = "3.54.2" # conda-smithy version used to generate this file +version = "3.58.0" # conda-smithy version used to generate this file description = "Pixi configuration for conda-forge/nodejs-feedstock" authors = ["@conda-forge/nodejs"] channels = ["conda-forge"]