From 960313fac6fec5ce0b9f7671e61141e01a95c694 Mon Sep 17 00:00:00 2001 From: Yousaf Nabi Date: Mon, 12 Feb 2024 22:52:52 +0000 Subject: [PATCH] fix: drop traveling-ruby to 3.2.3 due to segfaults on alpine --- .github/workflows/build.yml | 2 +- .github/workflows/manual_release.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/update.yml | 2 +- DEVELOPING.md | 30 ++++++++++++++-------------- Dockerfile-bundle-base | 2 +- Dockerfile-package-base | 2 +- Dockerfile-release-base | 2 +- README.md | 16 +++++++-------- RELEASING.md | 2 +- packaging/Gemfile | 2 +- packaging/Gemfile.lock | 4 ++-- packaging/README.md.template | 16 +++++++-------- tasks/package.rake | 6 +++--- 14 files changed, 45 insertions(+), 45 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b121514..30a165b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 with: - ruby-version: 3.3.0 + ruby-version: 3.2.3 - name: Set up environment run: bundle install - name: Build diff --git a/.github/workflows/manual_release.yml b/.github/workflows/manual_release.yml index 9d73680..096ac96 100644 --- a/.github/workflows/manual_release.yml +++ b/.github/workflows/manual_release.yml @@ -35,7 +35,7 @@ jobs: - uses: ruby/setup-ruby@v1 with: - ruby-version: 3.3.0 + ruby-version: 3.2.3 - name: Set up environment run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 81da913..d0a0ff2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: - uses: ruby/setup-ruby@v1 with: - ruby-version: 3.3.0 + ruby-version: 3.2.3 - name: Set up environment run: | diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 314db4a..32cebe8 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -15,7 +15,7 @@ jobs: - uses: ruby/setup-ruby@v1 with: - ruby-version: 3.3.0 + ruby-version: 3.2.3 - name: Set up environment run: | diff --git a/DEVELOPING.md b/DEVELOPING.md index 17fc20c..c9eb26c 100644 --- a/DEVELOPING.md +++ b/DEVELOPING.md @@ -54,15 +54,15 @@ Script is designed to run on Linux, but can be run on macOS or windows. For windows x86_64 cd windows - bash -c 'mkdir -p cache output/3.3.0' - bash -c './build-ruby -a x86 -r 3.3.0 cache output/3.3.0' - bash -c './package -r traveling-ruby-20230428-3.3.0-x86-windows.tar.gz output/3.3.0' + bash -c 'mkdir -p cache output/3.2.3' + bash -c './build-ruby -a x86 -r 3.2.3 cache output/3.2.3' + bash -c './package -r traveling-ruby-20230428-3.2.3-x86-windows.tar.gz output/3.2.3' For windows x86 - bash -c 'mkdir -p cache output/3.3.0' - bash -c './build-ruby -a x86_64 -r 3.3.0 cache output/3.3.0' - bash -c './package -r traveling-ruby-20230428-3.3.0-x86_64-windows.tar.gz output/3.3.0' + bash -c 'mkdir -p cache output/3.2.3' + bash -c './build-ruby -a x86_64 -r 3.2.3 cache output/3.2.3' + bash -c './package -r traveling-ruby-20230428-3.2.3-x86_64-windows.tar.gz output/3.2.3' ### Building the pact-ruby-standalone packages @@ -118,10 +118,10 @@ Build only selected platforms 2. Copy your built `traveling-ruby` package into the `build` folder 3. Ensure the version number in `tasks/package.rake` matches your package name 1. eg - 1. `traveling-ruby-20230508-3.3.0-linux-arm64.tar.gz` + 1. `traveling-ruby-20230508-3.2.3-linux-arm64.tar.gz` ```ruby - TRAVELING_RUBY_VERSION = "20230508-3.3.0" + TRAVELING_RUBY_VERSION = "20230508-3.2.3" ``` 4. Run `bundle exec rake package` as before @@ -130,13 +130,13 @@ Build only selected platforms | OS | Ruby | Architecture | Supported | | -------| ------- | ------------ | --------- | -| OSX | 3.3.0 | x86_64 | ✅ | -| OSX | 3.3.0 | aarch64 (arm)| ✅ | -| Linux | 3.3.0 | x86_64 | ✅ | -| Linux | 3.3.0 | aarch64 (arm)| ✅ | -| Windows| 3.3.0 | x86_64 | ✅ | -| Windows| 3.3.0 | x86 | ✅ | -| Windows| 3.3.0 | aarch64 (via x86 emulation) | ✅ | +| OSX | 3.2.3 | x86_64 | ✅ | +| OSX | 3.2.3 | aarch64 (arm)| ✅ | +| Linux | 3.2.3 | x86_64 | ✅ | +| Linux | 3.2.3 | aarch64 (arm)| ✅ | +| Windows| 3.2.3 | x86_64 | ✅ | +| Windows| 3.2.3 | x86 | ✅ | +| Windows| 3.2.3 | aarch64 (via x86 emulation) | ✅ | ## Testing diff --git a/Dockerfile-bundle-base b/Dockerfile-bundle-base index fc5ced9..50447e8 100644 --- a/Dockerfile-bundle-base +++ b/Dockerfile-bundle-base @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 ruby:3.3.0-alpine +FROM --platform=linux/amd64 ruby:3.2.3-alpine # Installation path ENV HOME=/app diff --git a/Dockerfile-package-base b/Dockerfile-package-base index 61edb8b..fca9f16 100644 --- a/Dockerfile-package-base +++ b/Dockerfile-package-base @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 ruby:3.3.0-slim +FROM --platform=linux/amd64 ruby:3.2.3-slim RUN apt-get update && apt-get install -y \ curl \ diff --git a/Dockerfile-release-base b/Dockerfile-release-base index bd16210..ef66638 100644 --- a/Dockerfile-release-base +++ b/Dockerfile-release-base @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 ruby:3.3.0-alpine +FROM --platform=linux/amd64 ruby:3.2.3-alpine # Installation path ENV HOME=/app diff --git a/README.md b/README.md index ab8be18..f86a155 100644 --- a/README.md +++ b/README.md @@ -46,17 +46,17 @@ See the [release page][releases]. ## Supported Platforms -Ruby is not required on the host platform, Ruby 3.3.0 is provided in the distributable. +Ruby is not required on the host platform, Ruby 3.2.3 is provided in the distributable. | OS | Ruby | Architecture | Supported | | -------| ------- | ------------ | --------- | -| MacOS | 3.3.0 | x86_64 | ✅ | -| MacOS | 3.3.0 | aarch64 (arm64)| ✅ | -| Linux | 3.3.0 | x86_64 | ✅ | -| Linux | 3.3.0 | aarch64 (arm64)| ✅ | -| Windows| 3.3.0 | x86_64 | ✅ | -| Windows| 3.3.0 | x86 | ✅ | -| Windows| 3.3.0 | aarch64 (arm64)| 🚧 | +| MacOS | 3.2.3 | x86_64 | ✅ | +| MacOS | 3.2.3 | aarch64 (arm64)| ✅ | +| Linux | 3.2.3 | x86_64 | ✅ | +| Linux | 3.2.3 | aarch64 (arm64)| ✅ | +| Windows| 3.2.3 | x86_64 | ✅ | +| Windows| 3.2.3 | x86 | ✅ | +| Windows| 3.2.3 | aarch64 (arm64)| 🚧 | 🚧 - Tested under emulation mode x86 / x86_64 in Windows on ARM diff --git a/RELEASING.md b/RELEASING.md index aefd1fa..4823a67 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -2,5 +2,5 @@ Run: - chruby 3.3.0 #or whatever your version manager is + chruby 3.2.3 #or whatever your version manager is script/release.sh [major|minor|patch] # default is minor diff --git a/packaging/Gemfile b/packaging/Gemfile index 35a7d70..e90fb0d 100644 --- a/packaging/Gemfile +++ b/packaging/Gemfile @@ -7,4 +7,4 @@ gem "pact-provider-verifier", "1.38.0" gem "pact_broker-client", "1.75.1" gem "webrick", "1.8.1" gem 'rack', '>= 2.2.6' -gem "json", "2.7.1" \ No newline at end of file +gem "json", "2.6.3" \ No newline at end of file diff --git a/packaging/Gemfile.lock b/packaging/Gemfile.lock index f93bc8b..d4f6bdb 100644 --- a/packaging/Gemfile.lock +++ b/packaging/Gemfile.lock @@ -16,7 +16,7 @@ GEM httparty (0.21.0) mini_mime (>= 1.0.0) multi_xml (>= 0.5.2) - json (2.7.1) + json (2.6.3) mini_mime (1.1.5) multi_xml (0.6.0) net-http (0.4.1) @@ -116,7 +116,7 @@ PLATFORMS x86_64-linux DEPENDENCIES - json (= 2.7.1) + json (= 2.6.3) pact (= 1.64.0) pact-message (= 0.11.1) pact-mock_service (= 3.11.2) diff --git a/packaging/README.md.template b/packaging/README.md.template index 1476781..8784016 100644 --- a/packaging/README.md.template +++ b/packaging/README.md.template @@ -46,17 +46,17 @@ See the [release page][releases]. ## Supported Platforms -Ruby is not required on the host platform, Ruby 3.3.0 is provided in the distributable. +Ruby is not required on the host platform, Ruby 3.2.3 is provided in the distributable. | OS | Ruby | Architecture | Supported | | -------| ------- | ------------ | --------- | -| MacOS | 3.3.0 | x86_64 | ✅ | -| MacOS | 3.3.0 | aarch64 (arm64)| ✅ | -| Linux | 3.3.0 | x86_64 | ✅ | -| Linux | 3.3.0 | aarch64 (arm64)| ✅ | -| Windows| 3.3.0 | x86_64 | ✅ | -| Windows| 3.3.0 | x86 | ✅ | -| Windows| 3.3.0 | aarch64 (arm64)| 🚧 | +| MacOS | 3.2.3 | x86_64 | ✅ | +| MacOS | 3.2.3 | aarch64 (arm64)| ✅ | +| Linux | 3.2.3 | x86_64 | ✅ | +| Linux | 3.2.3 | aarch64 (arm64)| ✅ | +| Windows| 3.2.3 | x86_64 | ✅ | +| Windows| 3.2.3 | x86 | ✅ | +| Windows| 3.2.3 | aarch64 (arm64)| 🚧 | 🚧 - Tested under emulation mode x86 / x86_64 in Windows on ARM diff --git a/tasks/package.rake b/tasks/package.rake index 305f5d0..629bd4c 100644 --- a/tasks/package.rake +++ b/tasks/package.rake @@ -3,7 +3,7 @@ require 'bundler/setup' PACKAGE_NAME = "pact" VERSION = File.read('VERSION').strip -TRAVELING_RUBY_VERSION = "20240205-3.3.0" +TRAVELING_RUBY_VERSION = "20240205-3.2.3" TRAVELING_RUBY_PKG_DATE = TRAVELING_RUBY_VERSION.split("-").first PLUGIN_CLI_VERSION = "0.1.0" @@ -46,8 +46,8 @@ namespace :package do end desc "Install gems to local directory" task :bundle_install do - if RUBY_VERSION !~ /^3\.3\./ - abort "You can only 'bundle install' using Ruby 3.3.0, because that's what Traveling Ruby uses." + if RUBY_VERSION !~ /^3\.2\./ + abort "You can only 'bundle install' using Ruby 3.2.3, because that's what Traveling Ruby uses." end sh "rm -rf build/tmp" sh "mkdir -p build/tmp"