From f59f2873968dff7ec0a872fb95be0f70da939e28 Mon Sep 17 00:00:00 2001 From: bethesque Date: Wed, 1 Jun 2022 05:46:18 +0000 Subject: [PATCH 1/8] fix: update standalone to 1.88.91-rc2 --- standalone/install.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/standalone/install.ts b/standalone/install.ts index 0f000153..e440419e 100644 --- a/standalone/install.ts +++ b/standalone/install.ts @@ -3,7 +3,7 @@ import path = require('path'); import fs = require('fs'); // Get latest version from https://github.com/pact-foundation/pact-ruby-standalone/releases -export const PACT_STANDALONE_VERSION = '1.88.83'; +export const PACT_STANDALONE_VERSION = '1.88.91-rc2'; const PACT_DEFAULT_LOCATION = `https://github.com/pact-foundation/pact-ruby-standalone/releases/download/v${PACT_STANDALONE_VERSION}/`; const HTTP_REGEX = /^http(s?):\/\//; From 60a5ecf540dc205c1e57fee67ea7111079d1176d Mon Sep 17 00:00:00 2001 From: Beth Skurrie Date: Wed, 1 Jun 2022 16:25:30 +1000 Subject: [PATCH 2/8] chore: ensure prerelease does not get stripped from standalone or ffi version --- script/lib/export-binary-versions.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/lib/export-binary-versions.sh b/script/lib/export-binary-versions.sh index 81841ca7..066d2464 100644 --- a/script/lib/export-binary-versions.sh +++ b/script/lib/export-binary-versions.sh @@ -2,5 +2,5 @@ LIB_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)" # Figure out where the script is running PROJECT_DIR="${LIB_DIR}"/../../ -export STANDALONE_VERSION=$(grep "PACT_STANDALONE_VERSION = '" "$PROJECT_DIR"/standalone/install.ts | grep -E -o "([0-9][\.0-9]+[0-9])") -export FFI_VERSION=v$(grep "PACT_FFI_VERSION = '" "$PROJECT_DIR"/src/ffi/index.ts | grep -E -o "([0-9][\.0-9]+[0-9])") \ No newline at end of file +export STANDALONE_VERSION=$(grep "PACT_STANDALONE_VERSION = '" "$PROJECT_DIR"/standalone/install.ts | grep -E -o "'(.*)'" | cut -d"'" -f2) +export FFI_VERSION=v$(grep "PACT_FFI_VERSION = '" "$PROJECT_DIR"/src/ffi/index.ts | grep -E -o "'(.*)'" | cut -d"'" -f2) \ No newline at end of file From e08b6f1aa84751845da5c7ba345bc6a684f0e773 Mon Sep 17 00:00:00 2001 From: Beth Skurrie Date: Wed, 1 Jun 2022 16:45:28 +1000 Subject: [PATCH 3/8] chore: update rc number --- standalone/install.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/standalone/install.ts b/standalone/install.ts index e440419e..661787b7 100644 --- a/standalone/install.ts +++ b/standalone/install.ts @@ -3,7 +3,7 @@ import path = require('path'); import fs = require('fs'); // Get latest version from https://github.com/pact-foundation/pact-ruby-standalone/releases -export const PACT_STANDALONE_VERSION = '1.88.91-rc2'; +export const PACT_STANDALONE_VERSION = '1.88.91-rc3'; const PACT_DEFAULT_LOCATION = `https://github.com/pact-foundation/pact-ruby-standalone/releases/download/v${PACT_STANDALONE_VERSION}/`; const HTTP_REGEX = /^http(s?):\/\//; From bb15ed0595a67a36c307f85061d7f3dd5ae35a90 Mon Sep 17 00:00:00 2001 From: Beth Skurrie Date: Wed, 1 Jun 2022 16:49:03 +1000 Subject: [PATCH 4/8] chore: update rc --- standalone/install.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/standalone/install.ts b/standalone/install.ts index 661787b7..e5e6827f 100644 --- a/standalone/install.ts +++ b/standalone/install.ts @@ -3,7 +3,7 @@ import path = require('path'); import fs = require('fs'); // Get latest version from https://github.com/pact-foundation/pact-ruby-standalone/releases -export const PACT_STANDALONE_VERSION = '1.88.91-rc3'; +export const PACT_STANDALONE_VERSION = '1.88.91-rc4'; const PACT_DEFAULT_LOCATION = `https://github.com/pact-foundation/pact-ruby-standalone/releases/download/v${PACT_STANDALONE_VERSION}/`; const HTTP_REGEX = /^http(s?):\/\//; From 96cc424237eb48c16950520ba8b13a4ade047358 Mon Sep 17 00:00:00 2001 From: Beth Skurrie Date: Wed, 1 Jun 2022 16:53:08 +1000 Subject: [PATCH 5/8] chore: remove linux ia32 binary download as this is no longer supported by Travelling Ruby --- standalone/install.ts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/standalone/install.ts b/standalone/install.ts index e5e6827f..7bd8c320 100644 --- a/standalone/install.ts +++ b/standalone/install.ts @@ -81,14 +81,6 @@ export function createConfig(location: string = process.cwd()): Config { downloadLocation: PACT_BINARY_LOCATION, folderName: `linux-x64-${PACT_STANDALONE_VERSION}`, }, - { - platform: 'linux', - arch: 'ia32', - binary: `pact-${PACT_STANDALONE_VERSION}-linux-x86.tar.gz`, - binaryChecksum: `pact-${PACT_STANDALONE_VERSION}-linux-x86.tar.gz${CHECKSUM_SUFFIX}`, - downloadLocation: PACT_BINARY_LOCATION, - folderName: `linux-ia32-${PACT_STANDALONE_VERSION}`, - }, ], }; } From c885e5cdef49e347f071d0910da87003d4a6dff3 Mon Sep 17 00:00:00 2001 From: Beth Skurrie Date: Wed, 1 Jun 2022 16:55:45 +1000 Subject: [PATCH 6/8] chore: remove download of linux-ia32 package --- script/lib/download-standalone.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/script/lib/download-standalone.sh b/script/lib/download-standalone.sh index 659bcc7c..40ba76ed 100755 --- a/script/lib/download-standalone.sh +++ b/script/lib/download-standalone.sh @@ -48,7 +48,6 @@ download_standalone "pact-${STANDALONE_VERSION}-win32.zip" "win32-${S if [ -z "${ONLY_DOWNLOAD_PACT_FOR_WINDOWS:-}" ]; then download_standalone "pact-${STANDALONE_VERSION}-osx.tar.gz" "darwin-${STANDALONE_VERSION}.tar.gz" download_standalone "pact-${STANDALONE_VERSION}-linux-x86_64.tar.gz" "linux-x64-${STANDALONE_VERSION}.tar.gz" - download_standalone "pact-${STANDALONE_VERSION}-linux-x86.tar.gz" "linux-ia32-${STANDALONE_VERSION}.tar.gz" fi # Write readme in the ffi folder From 1f6b243912f0759cad84d61ed0f5ba1151420733 Mon Sep 17 00:00:00 2001 From: Beth Skurrie Date: Wed, 1 Jun 2022 17:19:35 +1000 Subject: [PATCH 7/8] chore: remove test for linux ia32 --- src/pact-standalone.spec.ts | 49 ------------------------------------- 1 file changed, 49 deletions(-) diff --git a/src/pact-standalone.spec.ts b/src/pact-standalone.spec.ts index 7ba4d90d..561a51cd 100644 --- a/src/pact-standalone.spec.ts +++ b/src/pact-standalone.spec.ts @@ -87,55 +87,6 @@ describe('Pact Standalone', function () { }); }); - describe('Linux ia32', () => { - beforeEach(() => (pact = standalone('linux', 'ia32'))); - - it('broker relative path', () => { - expect(fs.existsSync(path.resolve(basePath, pact.brokerPath))).to.be - .true; - }); - - it('broker full path', () => { - expect(fs.existsSync(pact.brokerFullPath)).to.be.true; - }); - - it('mock service relative path', () => { - expect(fs.existsSync(path.resolve(basePath, pact.mockServicePath))).to - .be.true; - }); - - it('mock service full path', () => { - expect(fs.existsSync(pact.mockServiceFullPath)).to.be.true; - }); - - it('stub relative path', () => { - expect(fs.existsSync(path.resolve(basePath, pact.stubPath))).to.be - .true; - }); - - it('stub full path', () => { - expect(fs.existsSync(pact.stubFullPath)).to.be.true; - }); - - it('provider verifier relative path', () => { - expect(fs.existsSync(path.resolve(basePath, pact.verifierPath))).to.be - .true; - }); - - it('provider verifier full path', () => { - expect(fs.existsSync(pact.verifierFullPath)).to.be.true; - }); - - it('pact relative path', () => { - expect(fs.existsSync(path.resolve(basePath, pact.pactPath))).to.be - .true; - }); - - it('pact full path', () => { - expect(fs.existsSync(pact.pactFullPath)).to.be.true; - }); - }); - describe('Linux X64', () => { beforeEach(() => (pact = standalone('linux', 'x64'))); From 6aa08df144f065cf0ee215cd55bac082cd327a8b Mon Sep 17 00:00:00 2001 From: Beth Skurrie Date: Thu, 2 Jun 2022 13:22:16 +1000 Subject: [PATCH 8/8] chore: update to rc5 --- standalone/install.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/standalone/install.ts b/standalone/install.ts index 7bd8c320..af20258e 100644 --- a/standalone/install.ts +++ b/standalone/install.ts @@ -3,7 +3,7 @@ import path = require('path'); import fs = require('fs'); // Get latest version from https://github.com/pact-foundation/pact-ruby-standalone/releases -export const PACT_STANDALONE_VERSION = '1.88.91-rc4'; +export const PACT_STANDALONE_VERSION = '1.88.91-rc5'; const PACT_DEFAULT_LOCATION = `https://github.com/pact-foundation/pact-ruby-standalone/releases/download/v${PACT_STANDALONE_VERSION}/`; const HTTP_REGEX = /^http(s?):\/\//;