Merge branch 'chore/ensure_release_deps_updated' into chore/upgrade-to-pact-ruby-standalone-2-4-15

Author: YOU54F

Makefile

@@ -1,6 +1,6 @@
 SHELL:=/bin/bash
 export bin=@pact-foundation/pact-cli
-export pkg_version=$(shell cat package.json | jq -r .version)
+export pkg_version?=$(shell cat package.json | jq -r .version)
 supported_platforms = "linux-x64" "linux-arm64" "darwin-x64" "darwin-arm64" "windows-x64"
 export STANDALONE_VERSION=$(shell grep "PACT_STANDALONE_VERSION = '" standalone/install.ts | grep -E -o "'(.*)'" | cut -d"'" -f2)
 

package-lock.json

@@ -52,11 +52,11 @@
     "access": "public"
   },
   "optionalDependencies": {
-    "@pact-foundation/pact-cli-darwin-arm64": "16.0.0",
-    "@pact-foundation/pact-cli-darwin-x64": "16.0.0",
-    "@pact-foundation/pact-cli-windows-x64": "16.0.0",
-    "@pact-foundation/pact-cli-linux-x64": "16.0.0",
-    "@pact-foundation/pact-cli-linux-arm64": "16.0.0"
+    "@pact-foundation/pact-cli-darwin-arm64": "16.0.1",
+    "@pact-foundation/pact-cli-darwin-x64": "16.0.1",
+    "@pact-foundation/pact-cli-windows-x64": "16.0.1",
+    "@pact-foundation/pact-cli-linux-x64": "16.0.1",
+    "@pact-foundation/pact-cli-linux-arm64": "16.0.1"
   },
   "dependencies": {
     "chalk": "4.1.2",

package.json

@@ -21,10 +21,12 @@ node --version
 npm --version
 
 npm ci
-# Link os/arch specific npm package, for running os/arch system
-make link
 # Update main package.json optional dependencies versions, with those created earlier
 make update_opt_deps
+# update lockfile post buildling updated opt deps
+npm i
+# Link os/arch specific npm package, for running os/arch system
+make link
 npm run format:check
 npm run lint
 npm run build

script/ci/build-and-test.sh

@@ -16,16 +16,12 @@ if [[ ${DRY_RUN:-} == 'true' ]]; then
   echo "publishing in dry run mode"
   # Dry-run Publish os/arch specific npm packages
   make dry_run
-  # Update main package.json optional dependencies versions, with those created earlier
-  make update_opt_deps
   npm publish --access-public --dry-run
  else
   echo "--> Preparing npmrc file"
   "$SCRIPT_DIR"/create_npmrc_file.sh
   # Publish os/arch specific npm packages
   make publish
-  # Update main package.json optional dependencies versions, with those created earlier
-  make update_opt_deps
   npm publish --access public --tag latest
 fi
 echo "    done!"

script/ci/lib/publish.sh

@@ -41,6 +41,7 @@ if [ ! -z "${ONLY_DOWNLOAD_PACT_FOR_WINDOWS:-}" ]; then
   exit 1
 fi
 
+export pkg_version=$NEXT_VERSION
 "$SCRIPT_DIR"/download-standalone-and-test.sh
 
 if [[ ${DRY_RUN:-} == 'true' ]]; then