Skip to content

Commit

Permalink
feat: bump C-API
Browse files Browse the repository at this point in the history
  • Loading branch information
fpelliccioni committed Sep 6, 2024
1 parent d02b285 commit 2ade18a
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 15 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/knuth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,12 @@ jobs:
# {"name":"macOS 12 NodeJS 16","nodejs_version":"16","os":"macos-12","os_kind":"macos","march_id":"x64-ZLm9Pjh","test":"0"},
# ]}'

MATRIX: '{"config":[{"name":"Linux - GCC 13 - NodeJS 20","nodejs_version":"20","os":"ubuntu-22.04","os_kind":"linux","march_id":"x64-ZLm9Pjh","test":"1", "compiler_version":"13", "docker_suffix":"-ubuntu20.04"},
{"name":"macOS 14 (x86_64) - NodeJS 20","nodejs_version":"20","os":"macos-14-large","os_kind":"macos","march_id":"x64-ZLm9Pjh","arch":"x86_64","test":"0","macos_version":"14.0"},
# MATRIX: '{"config":[{"name":"Linux - GCC 13 - NodeJS 20","nodejs_version":"20","os":"ubuntu-22.04","os_kind":"linux","march_id":"x64-ZLm9Pjh","test":"1", "compiler_version":"13", "docker_suffix":"-ubuntu20.04"},
# {"name":"macOS 14 (x86_64) - NodeJS 20","nodejs_version":"20","os":"macos-14-large","os_kind":"macos","march_id":"x64-ZLm9Pjh","arch":"x86_64","test":"0","macos_version":"14.0"},
# {"name":"macOS 14 (ARM) - NodeJS 20","nodejs_version":"20","os":"macos-14-arm64","os_kind":"macos","march_id":"x64-ZLm9Pjh","arch":"armv8","test":"0","macos_version":"14.0"}
# ]}'

MATRIX: '{"config":[{"name":"Linux - GCC 14 - NodeJS 20","nodejs_version":"20","os":"ubuntu-22.04","os_kind":"linux","march_id":"x64-ZLm9Pjh","test":"1", "compiler_version":"14", "docker_suffix":"-ubuntu20.04"},
{"name":"macOS 14 (ARM) - NodeJS 20","nodejs_version":"20","os":"macos-14-arm64","os_kind":"macos","march_id":"x64-ZLm9Pjh","arch":"armv8","test":"0","macos_version":"14.0"}
]}'
run: |
Expand Down
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class KnuthJsNative(ConanFile):
description = "Bitcoin full node as a Javascript library"
settings = "os", "compiler", "build_type", "arch"

requires = (("c-api/0.47.0"))
requires = (("c-api/0.48.0"))

def configure(self):
self.options["c-api/*"].march_id = "ZLm9Pjh"
4 changes: 4 additions & 0 deletions helpers/build_and_test.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/usr/bin/env bash

if [ "$OSTYPE" == "darwin" ]; then
export MACOSX_DEPLOYMENT_TARGET=14.0
fi

rm -rf blockchain lib
node-pre-gyp configure build

Expand Down
2 changes: 1 addition & 1 deletion install.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
# import pandas as pd


capi_version = "0.47.0"
capi_version = "0.48.0"

def install(package):
print("Installing ")
Expand Down
18 changes: 9 additions & 9 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@knuth/bch-native",
"version": "1.3.0",
"version": "1.4.0",
"description": "Foundation library for @knuth/bch (Bitcoin Cash development platform for Javascript applications)",
"repository": {
"type": "git",
Expand Down Expand Up @@ -34,7 +34,7 @@
},
"dependencies": {
"@mapbox/node-pre-gyp": "^1.0.11",
"nan": "^2.17.0"
"nan": "^2.20.0"
},
"devDependencies": {
"jest": "^28.1.1"
Expand Down

0 comments on commit 2ade18a

Please sign in to comment.