diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 0877cfbf..b6de64b9 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -83,6 +83,7 @@ jobs: env: NODE_VERSION: ${{ matrix.node-version }} + LOG_LEVEL: debug steps: - uses: actions/checkout@v4 @@ -99,7 +100,7 @@ jobs: - if: runner.os == 'Windows' run: echo "ONLY_DOWNLOAD_PACT_FOR_WINDOWS=true" >> $GITHUB_ENV - - run: ./script/ci/unpack-and-test.sh + - run: LOG_LEVEL=debug ./script/ci/unpack-and-test.sh # Linux aarch64 tests are skipped as QEMU fails when executing the ruby binaries diff --git a/CHANGELOG.md b/CHANGELOG.md index cdf20249..745bcba4 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines. +## [14.3.4](https://github.com/pact-foundation/pact-js-core/compare/v14.3.3...v14.3.4) (2024-04-23) + + +### Fixes and Improvements + +* normalise PREBUILD_NAME to node.napi ([3812b0d](https://github.com/pact-foundation/pact-js-core/commit/3812b0def2559492c0ad4608db062e7c53526fec)) +* upgrade to latest ffi 0.4.19 ([7a7d9b0](https://github.com/pact-foundation/pact-js-core/commit/7a7d9b0af6e5d9bfd2356f21808c48a407cf8a03)) + ## [14.3.3](https://github.com/pact-foundation/pact-js-core/compare/v14.3.2...v14.3.3) (2024-03-25) diff --git a/package-lock.json b/package-lock.json index 9698ba6f..7f3a7e01 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@pact-foundation/pact-core", - "version": "14.3.3", + "version": "14.3.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@pact-foundation/pact-core", - "version": "14.3.3", + "version": "14.3.4", "cpu": [ "x64", "ia32", diff --git a/package.json b/package.json index c6121c5d..77445b44 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@pact-foundation/pact-core", - "version": "14.3.3", + "version": "14.3.4", "description": "Core of @pact-foundation/pact. You almost certainly don't want to depend on this directly.", "main": "src/index.js", "homepage": "https://github.com/pact-foundation/pact-js-core#readme", diff --git a/script/ci/prebuild.sh b/script/ci/prebuild.sh index 21b354f4..c3c5b0a3 100755 --- a/script/ci/prebuild.sh +++ b/script/ci/prebuild.sh @@ -17,6 +17,10 @@ elif [[ ${SET_NVM:-} == 'true' && "$(uname -s)" == 'Linux' ]]; then nvm use $NODE_VERSION fi +PREBUILDIFY_VERSION=6.0.1 +NODE_VERSION=$(node -p process.version) +PREBUILD_NAME="node.napi" + ## normalise OS and ARCH names OS=$(uname -s | tr '[:upper:]' '[:lower:]') ARCH=$(uname -m | tr '[:upper:]' '[:lower:]') @@ -29,11 +33,11 @@ node --version npm --version echo "OS: $OS" echo "ARCH: $ARCH" -PREBUILDIFY_VERSION=5.0.1 ./script/download-libs.sh npm ci --ignore-scripts -npx --yes prebuildify@${PREBUILDIFY_VERSION} --napi +export npm_config_target=${NODE_VERSION} +npx --yes prebuildify@${PREBUILDIFY_VERSION} --napi --name ${PREBUILD_NAME} ls prebuilds/**/* case $OS in darwin) @@ -86,4 +90,4 @@ case $OS in ;; esac ls -rm -rf ffi build \ No newline at end of file +rm -rf ffi build \ No newline at end of file diff --git a/src/ffi/index.ts b/src/ffi/index.ts index bd0313ea..b8dc62ca 100644 --- a/src/ffi/index.ts +++ b/src/ffi/index.ts @@ -4,7 +4,7 @@ import logger, { DEFAULT_LOG_LEVEL } from '../logger'; import { LogLevel } from '../logger/types'; import { Ffi } from './types'; -export const PACT_FFI_VERSION = '0.4.16'; +export const PACT_FFI_VERSION = '0.4.19'; // supported prebuilds // darwin-arm64