diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 25d96290..d08eed2c 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,17 +5,15 @@ jobs: - job: osx pool: - vmImage: $(VMIMAGE) + vmImage: macOS-15 strategy: matrix: osx_64_: CONFIG: osx_64_ UPLOAD_PACKAGES: 'True' - VMIMAGE: macOS-15 osx_arm64_: CONFIG: osx_arm64_ UPLOAD_PACKAGES: 'True' - VMIMAGE: macOS-15-arm64 timeoutInMinutes: 360 variables: {} diff --git a/.ci_support/migrations/absl_grpc_proto_25Q2.yaml b/.ci_support/migrations/absl_grpc_proto_25Q2.yaml deleted file mode 100644 index 10b7a095..00000000 --- a/.ci_support/migrations/absl_grpc_proto_25Q2.yaml +++ /dev/null @@ -1,29 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libabseil 20250512, libgrpc 1.73 & libprotobuf 6.31.1 - kind: version - migration_number: 1 - exclude: - # core deps - - abseil-cpp - - grpc-cpp - - libprotobuf - # required for building/testing - - protobuf - - re2 - # bazel stack - - bazel - - grpc_java_plugin - - singlejar -libabseil: -- 20250512 -libgrpc: -- "1.73" -libprotobuf: -- 6.31.1 -# we need to leave this migration open until we're ready to move the global baseline, see -# https://github.com/conda-forge/conda-forge.github.io/issues/2467; grpc 1.72 requires 11.0, -# see https://github.com/grpc/grpc/commit/f122d248443c81592e748da1adb240cbf0a0231c -c_stdlib_version: # [osx] - - 11.0 # [osx] -migrator_ts: 1748506837.6039238 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index c9cc8747..7be6b4bc 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '11.0' +- '10.15' MACOSX_SDK_VERSION: - '11.0' brotli: @@ -13,7 +13,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/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index 5b1742d7..a48bdf43 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -34,7 +34,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Build on Linux id: build-linux diff --git a/LICENSE.txt b/LICENSE.txt index c5aa738f..2ec51d75 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,5 +1,6 @@ BSD-3-Clause license -Copyright (c) 2015-2026, conda-forge contributors +Copyright (c) 2015-2022, conda-forge contributors +All rights reserved. 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 825a4aff..9dfe4403 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,6 +1,5 @@ #!/bin/sh """exec" "python3" "$0" "$@" #""" # fmt: off # fmt: on - # # This file has been generated by conda-smithy in order to build the recipe # locally. diff --git a/pixi.toml b/pixi.toml index 0d533caa..a7eb9ec9 100644 --- a/pixi.toml +++ b/pixi.toml @@ -5,7 +5,7 @@ [workspace] name = "nodejs-feedstock" -version = "3.55.1" # conda-smithy version used to generate this file +version = "3.54.2" # conda-smithy version used to generate this file description = "Pixi configuration for conda-forge/nodejs-feedstock" authors = ["@conda-forge/nodejs"] channels = ["conda-forge"] diff --git a/recipe/recipe.yaml b/recipe/recipe.yaml index 427b1636..15d2caa0 100644 --- a/recipe/recipe.yaml +++ b/recipe/recipe.yaml @@ -1,7 +1,7 @@ schema_version: 1 context: - version: "25.6.1" + version: "25.7.0" # NODE_MODULE_VERSION set in src/node_version.h NODE_MODULE_VERSION: 141 @@ -14,7 +14,7 @@ source: - if: unix then: url: https://nodejs.org/dist/v${{ version }}/node-v${{ version }}.tar.gz - sha256: a72bb2b274e8ddf3c933ea7a73d5ac4fce7503e45edc9d541fc75d104fa848c3 + sha256: 2a36edd1c8cc4d275464ff873a199937c8237c13f6943db5f7879f8a83ceddbe patches: - patches/0001-stop-removing-librt.patch - patches/0002-include-obj-name-in-shared-intermediate.patch @@ -23,11 +23,11 @@ source: - if: target_platform == "win-64" then: url: https://nodejs.org/dist/v${{ version }}/node-v${{ version }}-win-x64.zip - sha256: 0ae2300cdf44c399b5b351edbefb3534d1342a6fabd64302ca8c8e2fb86b0445 + sha256: 4a66eac416c30474fe9c3f0ef7d4ffc85a8797cbc35f6b8566dfbce02789a9c4 - if: target_platform == "win-arm64" then: url: https://nodejs.org/dist/v${{ version }}/node-v${{ version }}-win-arm64.zip - sha256: e11f610f584261617259aba8cbb8d2af6d1eb726cc0a433197572e5882d0bf77 + sha256: 8b824eb15ae95d24bd082cee9637f74d5850ba5c8649bd65c5f108e360835f1e build: number: 0