Merge branch 'x-plat_test'

Author: YOU54F

.cirrus.yml

@@ -0,0 +1,76 @@
+BUILD_TEST_TASK_TEMPLATE: &BUILD_TEST_TASK_TEMPLATE
+  arch_check_script: uname -am
+  test_script: chmod +x ./scripts/ci/test.sh &&  ./scripts/ci/test.sh
+
+# These are probably expected to fail in the post install script
+# as we are packing v2.0.0 of pact-ruby-standalone that supports
+# arm64 linux
+# linux_arm64_task:
+#   skip: "!changesInclude('.github/**')" 
+#   env:
+#     matrix:
+#       - IMAGE: node:15-slim
+#       - IMAGE: node:16-slim
+#       - IMAGE: node:17-slim
+#       - IMAGE: node:18-slim
+#       - IMAGE: node:19-slim
+#       - IMAGE: node:20-slim
+#   arm_container:
+#     image: $IMAGE
+#   install_script:
+#     - apt update --yes && apt install --yes curl python3 make build-essential g++ jq
+#   << : *BUILD_TEST_TASK_TEMPLATE
+
+linux_amd64_task:
+  skip: "!changesInclude('.github/**')" 
+  env:
+    matrix:
+      - IMAGE: node:16-slim
+      - IMAGE: node:17-slim
+      - IMAGE: node:18-slim
+      - IMAGE: node:19-slim
+      - IMAGE: node:20-slim
+  container:
+    image: $IMAGE
+  install_script:
+    - apt update --yes && apt install --yes curl python3 make build-essential g++ jq
+  << : *BUILD_TEST_TASK_TEMPLATE
+
+
+mac_task:
+  skip: "!changesInclude('.github/**')" 
+  macos_instance:
+    image: ghcr.io/cirruslabs/macos-ventura-base:latest
+  env:
+    NVS_HOME: ${HOME}/.nvs
+    PATH: ${NVS_HOME}:${PATH}
+    matrix:
+      - NODE_VERSION: 16
+      - NODE_VERSION: 17
+      - NODE_VERSION: 18
+      - NODE_VERSION: 19
+      - NODE_VERSION: 20
+  install nvs_script: |
+    git clone https://github.com/jasongin/nvs "$NVS_HOME"
+    . "$NVS_HOME/nvs.sh" install
+  install_test_arm64_script: |
+    . "$NVS_HOME/nvs.sh"
+    nvs add $NODE_VERSION
+    nvs use $NODE_VERSION
+    file $(which node) | grep -e 'arm64'
+    node --version
+  << : *BUILD_TEST_TASK_TEMPLATE
+  install_rosetta_script: softwareupdate --install-rosetta --agree-to-license
+  install_test_x64_script: | 
+    rm -rf node_modules
+    . "$NVS_HOME/nvs.sh"
+    nvs add $NODE_VERSION/x64
+    nvs use $NODE_VERSION/x64
+    file $(which node) | grep -e 'x64'
+    node --version
+    arch -x86_64 npm run intro
+    arch -x86_64 npm run test:consumer
+    arch -x86_64 npm run pact:show
+    arch -x86_64 npm run test:provider
+    arch -x86_64 npm test
+    arch -x86_64 npm run get:broker

.github/workflows/node.js.yml

@@ -6,29 +6,40 @@ name: Node.js CI
 on:
   workflow_dispatch:
   push:
-    branches: [ "main" ]
+    paths:
+      - '!.cirrus.yml'
+      - '**'
   pull_request:
-    branches: [ "main" ]
-
+    paths:
+      - '!.cirrus.yml'
+      - '**'
+  
 jobs:
   build:
 
-    runs-on: ubuntu-latest
-
+    runs-on: ${{ matrix.os }}
+    defaults:
+      run:
+        shell: bash
     strategy:
+      fail-fast: false
       matrix:
-        node-version: [14.x, 16.x]
+        node-version: [16,17,18,19,20]
+        os: [ubuntu-latest,macos-latest,windows-latest]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
-
     steps:
     - uses: actions/checkout@v3
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
-    - run: npm run intro
-    - run: npm run test:consumer
-    - run: npm run pact:show
-    - run: npm run test:provider
-    - run: npm test
-    - run: npm run get:broker
+    # - run: | # https://github.com/nodejs/node-gyp/blob/main/docs/Updating-npm-bundled-node-gyp.md
+    #     npm -v
+    #     npm explore npm/node_modules/@npmcli/run-script -g -- npm_config_global=false npm install node-gyp@latest
+    #   if: matrix.node-version == '15' && runner.os == 'MacOS'
+    # - run: |
+    #     npm -v
+    #     where node
+    #     cd "C:\\Program Files\nodejs\\"
+    #     npm install node-gyp@latest
+    - run: ./scripts/ci/test.sh

.replit

@@ -16,6 +16,7 @@ POETRY_CACHE_DIR = "${HOME}/${REPL_SLUG}/.cache/pypoetry"
 XDG_CONFIG_HOME = "/home/runner/.config"
 PATH = "/home/runner/$REPL_SLUG/.config/npm/node_global/bin:/home/runner/$REPL_SLUG/node_modules/.bin:${VIRTUAL_ENV}/lib/python3.8/site-packages:${VIRTUAL_ENV}/bin"
 npm_config_prefix = "/home/runner/$REPL_SLUG/.config/npm/node_global"
+IS_REPL = "true"
 
 [unitTest]
 language = "nodejs"

consumer/orderClient.js

@@ -1,8 +1,10 @@
 const request = require("superagent");
 const { Order } = require("./order");
 
+const hostname = "127.0.0.1"
+
 const fetchOrders = () => {
-  return request.get(`http://127.0.0.1:${process.env.API_PORT}/orders`).then(
+  return request.get(`http://${hostname}:${process.env.API_PORT}/orders`).then(
     (res) => {
       return res.body.reduce((acc, o) => {
         acc.push(new Order(o.id, o.items));

package-lock.json

@@ -19,8 +19,11 @@
     "test:provider": "node runProviderTest.js",
     "pact:publish": "./publish.sh",
     "pact:show": "cat pacts/GettingStartedOrderWeb-GettingStartedOrderApi.json | jq .",
-    "test": "PACT_URL=$PWD/pacts/GettingStartedOrderWeb-GettingStartedOrderApi.json npm run test:consumer && npm run test:provider",
-    "test:broker": "PACT_BROKER_BASE_URL=https://pactbroker.$REPL_OWNER.repl.co npm run test:consumer && npm run pact:publish && npm run test:provider",
+    "test": "cross-env PACT_URL=$PWD/pacts/GettingStartedOrderWeb-GettingStartedOrderApi.json npm run test:consumer && npm run test:provider",
+    "test:broker": "cross-env PACT_BROKER_BASE_URL=https://pactbroker.$REPL_OWNER.repl.co npm run test:consumer && npm run pact:publish && npm run test:provider",
     "get:broker": "echo 'fork a copy of https://replit.com/@pact/pactbroker and run npm test:broker when it has started'"
+  },
+  "devDependencies": {
+    "cross-env": "^7.0.3"
   }
 }

package.json

@@ -17,6 +17,7 @@ const provider = new Pact({
   host: "127.0.0.1",
   consumer: consumerName,
   provider: providerName,
+  host: "127.0.0.1"
 });
 
 // used to kill any left over mock server instances in case of errors

pact.js

@@ -8,6 +8,8 @@ let port;
 let opts;
 let app;
 
+const hostname = "127.0.0.1"
+
 // Verify that the provider meets all consumer expectations
 describe("Pact Verification", () => {
   before(async () => {
@@ -18,7 +20,7 @@ describe("Pact Verification", () => {
       provider: providerName,
       // we need to where the provider will be running,
       // we are starting it locally and defined the port above
-      providerBaseUrl: `http://127.0.0.1:${port}`,
+      providerBaseUrl: `http://${hostname}:${port}`,
       // You can set the log level here, useful for debugging
       logLevel: "info"
     };

provider/provider.spec.js

@@ -1,3 +1,4 @@
+#!/bin/bash
 GIT_COMMIT=$(git rev-parse HEAD)
 GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
 pact-broker publish pacts \

publish.sh

@@ -1,10 +1,10 @@
 { pkgs }: {
 	deps = [
-		pkgs.python39Full
-    pkgs.nodejs-16_x
-          pkgs.nodePackages.typescript-language-server
-          pkgs.yarn
-          pkgs.replitPackages.jest
-    pkgs.jq
+	pkgs.python39Full
+      pkgs.nodejs-16_x
+      pkgs.nodePackages.typescript-language-server
+      pkgs.yarn
+      pkgs.replitPackages.jest
+      pkgs.jq
 	];
 }

replit.nix

@@ -0,0 +1,11 @@
+#!/bin/bash -eu
+set -eu # This needs to be here for windows bash, which doesn't read the #! line above
+
+
+node --version
+npm run intro
+npm run test:consumer
+npm run pact:show
+npm run test:provider
+npm test
+npm run get:broker