@pact-foundation/pact-core 13.7.9 → 13.8.0

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [13.8.0](https://github.com/pact-foundation/pact-js-core/compare/v13.7.9...v13.8.0) (2022-09-05)
+
+
+### Features
+
+* Add Linux/arm64 support ([a174d7b](https://github.com/pact-foundation/pact-js-core/commit/a174d7b89105043b21522e56efa1a35f8c8222c4))
+
 ### [13.7.9](https://github.com/pact-foundation/pact-js-core/compare/v13.7.8...v13.7.9) (2022-08-30)
 
 

package/binding.gyp

@@ -70,7 +70,7 @@
           }
         ],
         [
-          "OS==\"linux\"",
+          "OS==\"linux\" and target_arch ==\"x64\"",
           {
             "link_settings": {
               "libraries": [
@@ -80,6 +80,18 @@
               ]
             }
           }
+        ],
+        [
+          "OS==\"linux\" and target_arch ==\"arm64\"",
+          {
+            "link_settings": {
+              "libraries": [
+                "-lpact_ffi",
+                "-L<(module_root_dir)/ffi/linuxaarch64",
+                "-Wl,-rpath,'$$ORIGIN'/linuxaarch64"
+              ]
+            }
+          }
         ]
       ],
       "library_dirs": [
@@ -113,6 +125,12 @@
             "<(module_root_dir)/ffi/osxaarch64/libpact_ffi.dylib",
           ],
           "destination": "<(PRODUCT_DIR)/osxaarch64"
+        },
+        {
+          "files": [
+            "<(module_root_dir)/ffi/linuxaarch64/libpact_ffi.so",
+          ],
+          "destination": "<(PRODUCT_DIR)/linuxaarch64"
         }
       ]
     },

package/build/Makefile

@@ -319,7 +319,7 @@ endif
 
 quiet_cmd_regen_makefile = ACTION Regenerating $@
 cmd_regen_makefile = cd $(srcdir); /opt/hostedtoolcache/node/12.22.12/x64/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/home/runner/.cache/node-gyp/12.22.12" "-Dnode_gyp_dir=/opt/hostedtoolcache/node/12.22.12/x64/lib/node_modules/npm/node_modules/node-gyp" "-Dnode_lib_file=/home/runner/.cache/node-gyp/12.22.12/<(target_arch)/node.lib" "-Dmodule_root_dir=/home/runner/work/pact-js-core/pact-js-core" "-Dnode_engine=v8" "--depth=." "-Goutput_dir=." "--generator-output=build" -I/home/runner/work/pact-js-core/pact-js-core/build/config.gypi -I/opt/hostedtoolcache/node/12.22.12/x64/lib/node_modules/npm/node_modules/node-gyp/addon.gypi -I/home/runner/.cache/node-gyp/12.22.12/include/node/common.gypi "--toplevel-dir=." binding.gyp
-Makefile: $(srcdir)/build/config.gypi $(srcdir)/../../../../../opt/hostedtoolcache/node/12.22.12/x64/lib/node_modules/npm/node_modules/node-gyp/addon.gypi $(srcdir)/../../../.cache/node-gyp/12.22.12/include/node/common.gypi $(srcdir)/binding.gyp
+Makefile: $(srcdir)/build/config.gypi $(srcdir)/../../../.cache/node-gyp/12.22.12/include/node/common.gypi $(srcdir)/binding.gyp $(srcdir)/../../../../../opt/hostedtoolcache/node/12.22.12/x64/lib/node_modules/npm/node_modules/node-gyp/addon.gypi
 	$(call do_cmd,regen_makefile)
 
 # "all" is a concatenation of the "all" targets from all the included

package/build/copy_release_artifacts.target.mk

@@ -23,7 +23,12 @@ $(builddir)/osxaarch64/libpact_ffi.dylib: /home/runner/work/pact-js-core/pact-js
 	$(call do_cmd,copy)
 
 all_deps += $(builddir)/osxaarch64/libpact_ffi.dylib
-binding_gyp_copy_release_artifacts_target_copies = $(builddir)/libpact_ffi.dylib $(builddir)/libpact_ffi.so $(builddir)/pact_ffi.dll $(builddir)/osxaarch64/libpact_ffi.dylib
+$(builddir)/linuxaarch64/libpact_ffi.so: TOOLSET := $(TOOLSET)
+$(builddir)/linuxaarch64/libpact_ffi.so: /home/runner/work/pact-js-core/pact-js-core/ffi/linuxaarch64/libpact_ffi.so FORCE_DO_CMD
+	$(call do_cmd,copy)
+
+all_deps += $(builddir)/linuxaarch64/libpact_ffi.so
+binding_gyp_copy_release_artifacts_target_copies = $(builddir)/libpact_ffi.dylib $(builddir)/libpact_ffi.so $(builddir)/pact_ffi.dll $(builddir)/osxaarch64/libpact_ffi.dylib $(builddir)/linuxaarch64/libpact_ffi.so
 
 ### Rules for final target.
 # Build our special outputs first.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pact-foundation/pact-core",
-  "version": "13.7.9",
+  "version": "13.8.0",
   "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",

package/src/ffi/internals/index.js

@@ -11,11 +11,12 @@ const LIBNAME_PREFIX_LOOKUP = {
     darwin: 'lib',
     win32: '',
 };
-const ARCH_LOOKUP = { x64: 'x86_64', arm64: 'aarch64-apple-darwin' };
+const ARCH_LOOKUP = { x64: 'x86_64', arm64: 'aarch64' };
 const EXTENSION_LOOKUP = {
     'osx-x86_64': 'dylib',
-    'osx-aarch64-apple-darwin': 'dylib',
+    'osx-aarch64': 'dylib',
     'linux-x86_64': 'so',
+    'linux-aarch64': 'so',
     'windows-x86_64': 'dll',
 };
 const libName = (library, version, processArch = process.arch, processPlatform = process.platform) => {

package/src/ffi/internals/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AAEA,MAAM,eAAe,GAAG;IACtB,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,KAAK;IACb,KAAK,EAAE,SAAS;CACjB,CAAC;AAIF,MAAM,qBAAqB,GAAG;IAC5B,KAAK,EAAE,KAAK;IACZ,MAAM,EAAE,KAAK;IACb,KAAK,EAAE,EAAE;CACV,CAAC;AAIF,MAAM,WAAW,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,sBAAsB,EAAE,CAAC;AAIrE,MAAM,gBAAgB,GAAG;IACvB,YAAY,EAAE,OAAO;IACrB,0BAA0B,EAAE,OAAO;IACnC,cAAc,EAAE,IAAI;IACpB,gBAAgB,EAAE,KAAK;CACxB,CAAC;AAEK,MAAM,OAAO,GAAG,CACrB,OAAe,EACf,OAAe,EACf,WAAW,GAAG,OAAO,CAAC,IAAI,EAC1B,eAAe,GAAG,OAAO,CAAC,QAAQ,EAC1B,EAAE;IACV,MAAM,IAAI,GAAG,WAAW,CAAC,WAAW,CAAC,CAAC;IACtC,MAAM,QAAQ,GAAG,eAAe,CAAC,eAAe,CAAC,CAAC;IAElD,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE;QACtB,MAAM,IAAI,KAAK,CACb,sFAAsF,eAAe,IAAI,WAAW,GAAG,CACxH,CAAC;KACH;IAED,MAAM,MAAM,GAAG,GAAG,QAAQ,IAAI,IAAI,EAAE,CAAC;IAErC,MAAM,SAAS,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAC3C,IAAI,CAAC,SAAS,EAAE;QACd,MAAM,IAAI,KAAK,CACb,8FAA8F,MAAM,GAAG,CACxG,CAAC;KACH;IAED,MAAM,aAAa,GAAG,qBAAqB,CAAC,eAAe,CAAC,CAAC;IAC7D,IAAI,aAAa,KAAK,SAAS,EAAE;QAC/B,MAAM,IAAI,KAAK,CACb,8DAA8D,eAAe,GAAG,CACjF,CAAC;KACH;IAED,OAAO,GAAG,OAAO,IAAI,aAAa,GAAG,OAAO,IAAI,MAAM,IAAI,SAAS,EAAE,CAAC;AACxE,CAAC,CAAC;AAhCW,QAAA,OAAO,WAgClB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AAEA,MAAM,eAAe,GAAG;IACtB,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,KAAK;IACb,KAAK,EAAE,SAAS;CACjB,CAAC;AAIF,MAAM,qBAAqB,GAAG;IAC5B,KAAK,EAAE,KAAK;IACZ,MAAM,EAAE,KAAK;IACb,KAAK,EAAE,EAAE;CACV,CAAC;AAIF,MAAM,WAAW,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;AAIxD,MAAM,gBAAgB,GAAG;IACvB,YAAY,EAAE,OAAO;IACrB,aAAa,EAAE,OAAO;IACtB,cAAc,EAAE,IAAI;IACpB,eAAe,EAAE,IAAI;IACrB,gBAAgB,EAAE,KAAK;CACxB,CAAC;AAEK,MAAM,OAAO,GAAG,CACrB,OAAe,EACf,OAAe,EACf,WAAW,GAAG,OAAO,CAAC,IAAI,EAC1B,eAAe,GAAG,OAAO,CAAC,QAAQ,EAC1B,EAAE;IACV,MAAM,IAAI,GAAG,WAAW,CAAC,WAAW,CAAC,CAAC;IACtC,MAAM,QAAQ,GAAG,eAAe,CAAC,eAAe,CAAC,CAAC;IAElD,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE;QACtB,MAAM,IAAI,KAAK,CACb,sFAAsF,eAAe,IAAI,WAAW,GAAG,CACxH,CAAC;KACH;IAED,MAAM,MAAM,GAAG,GAAG,QAAQ,IAAI,IAAI,EAAE,CAAC;IAErC,MAAM,SAAS,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAC3C,IAAI,CAAC,SAAS,EAAE;QACd,MAAM,IAAI,KAAK,CACb,8FAA8F,MAAM,GAAG,CACxG,CAAC;KACH;IAED,MAAM,aAAa,GAAG,qBAAqB,CAAC,eAAe,CAAC,CAAC;IAC7D,IAAI,aAAa,KAAK,SAAS,EAAE;QAC/B,MAAM,IAAI,KAAK,CACb,8DAA8D,eAAe,GAAG,CACjF,CAAC;KACH;IAED,OAAO,GAAG,OAAO,IAAI,aAAa,GAAG,OAAO,IAAI,MAAM,IAAI,SAAS,EAAE,CAAC;AACxE,CAAC,CAAC;AAhCW,QAAA,OAAO,WAgClB"}