Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: update standalone to 2.4.15 #21

Merged
merged 3 commits into from
Oct 23, 2024
Merged

fix: update standalone to 2.4.15 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c7de0bf
fix: update standalone to 2.4.15
pact-dev Oct 23, 2024
d1d5bf0
chore(release): ensure updated package json is committed back
YOU54F Oct 23, 2024
ce841a5
Merge branch 'chore/ensure_release_deps_updated' into chore/upgrade-t…
YOU54F Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
68 changes: 67 additions & 1 deletion package-lock.json
View file
Open in desktop

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

10 changes: 5 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 4 additions & 2 deletions script/ci/build-and-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions script/ci/lib/publish.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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!"
1 change: 1 addition & 0 deletions script/ci/release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion standalone/install.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import chalk = require('chalk');

// Get latest version from https://github.com/pact-foundation/pact-ruby-standalone/releases
export const PACT_STANDALONE_VERSION = '2.4.14';
export const PACT_STANDALONE_VERSION = '2.4.15';

function makeError(msg: string): Error {
return new Error(chalk.red(`Error while locating pact binary: ${msg}`));
Expand Down