From 2b43c309e23f3fab0f63db6c00fc73c335ac2c36 Mon Sep 17 00:00:00 2001 From: Yousaf Nabi Date: Thu, 8 Feb 2024 15:43:32 +0000 Subject: [PATCH] Revert "chore(deps): upgrade traveling-ruby to 20240205-3.3.0" --- .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 | 4 +-- Dockerfile-package-base | 4 +-- Dockerfile-release-base | 4 +-- Gemfile.lock | 18 +++++----- README.md | 16 ++++----- RELEASING.md | 2 +- packaging/Gemfile | 2 +- packaging/Gemfile.lock | 52 ++++++++++++---------------- packaging/README.md.template | 16 ++++----- tasks/package.rake | 6 ++-- 15 files changed, 76 insertions(+), 86 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b121514..39b0330 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.2 - 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..ff98ab8 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.2 - name: Set up environment run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 81da913..3a06867 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.2 - name: Set up environment run: | diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 314db4a..531f50b 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.2 - name: Set up environment run: | diff --git a/DEVELOPING.md b/DEVELOPING.md index 17fc20c..7f17b4e 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.2' + bash -c './build-ruby -a x86 -r 3.2.2 cache output/3.2.2' + bash -c './package -r traveling-ruby-20230428-3.2.2-x86-windows.tar.gz output/3.2.2' 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.2' + bash -c './build-ruby -a x86_64 -r 3.2.2 cache output/3.2.2' + bash -c './package -r traveling-ruby-20230428-3.2.2-x86_64-windows.tar.gz output/3.2.2' ### 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.2-linux-arm64.tar.gz` ```ruby - TRAVELING_RUBY_VERSION = "20230508-3.3.0" + TRAVELING_RUBY_VERSION = "20230508-3.2.2" ``` 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.2 | x86_64 | ✅ | +| OSX | 3.2.2 | aarch64 (arm)| ✅ | +| Linux | 3.2.2 | x86_64 | ✅ | +| Linux | 3.2.2 | aarch64 (arm)| ✅ | +| Windows| 3.2.2 | x86_64 | ✅ | +| Windows| 3.2.2 | x86 | ✅ | +| Windows| 3.2.2 | aarch64 (via x86 emulation) | ✅ | ## Testing diff --git a/Dockerfile-bundle-base b/Dockerfile-bundle-base index fc5ced9..bdb7704 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.2-alpine # Installation path ENV HOME=/app @@ -9,6 +9,6 @@ RUN set -ex && \ chmod g+w $HOME && \ apk add --update --no-cache make gcc libc-dev -RUN gem install bundler -v "~> 2.5" +RUN gem install bundler -v "~> 2.4" COPY packaging/Gemfile packaging/Gemfile.lock $HOME/ RUN bundle install --no-cache diff --git a/Dockerfile-package-base b/Dockerfile-package-base index 61edb8b..a740d57 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.2-slim RUN apt-get update && apt-get install -y \ curl \ @@ -12,7 +12,7 @@ RUN useradd --create-home --home-dir $HOME user \ && mkdir -p $HOME \ && chown -R user:user $HOME -RUN gem install bundler:2.5.3 +RUN gem install bundler:2.4.0 RUN bundle install COPY Rakefile README.md Gemfile Gemfile.lock VERSION $HOME/ COPY tasks $HOME/tasks diff --git a/Dockerfile-release-base b/Dockerfile-release-base index bd16210..30eb7b1 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.2-alpine # Installation path ENV HOME=/app @@ -9,6 +9,6 @@ RUN set -ex && \ chmod g+w $HOME && \ apk add --update --no-cache make gcc libc-dev git -RUN gem install bundler -v "~> 2.5" +RUN gem install bundler -v "~> 2.4" COPY Gemfile Gemfile.lock $HOME/ RUN bundle install --no-cache diff --git a/Gemfile.lock b/Gemfile.lock index 2f4b53e..36e877c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,25 +1,23 @@ GEM remote: http://rubygems.org/ specs: - addressable (2.8.6) + addressable (2.8.3) public_suffix (>= 2.0.2, < 6.0) bump (0.10.0) conventional-changelog (1.3.0) - faraday (2.9.0) - faraday-net_http (>= 2.0, < 3.2) - faraday-net_http (3.1.0) - net-http - net-http (0.4.1) - uri + faraday (2.7.4) + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-net_http (3.0.2) octokit (4.25.1) faraday (>= 1, < 3) sawyer (~> 0.9) - public_suffix (5.0.4) + public_suffix (5.0.1) rake (12.3.3) + ruby2_keywords (0.0.5) sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) - uri (0.13.0) PLATFORMS ruby @@ -31,4 +29,4 @@ DEPENDENCIES rake (~> 12.3) BUNDLED WITH - 2.5.3 + 2.4.10 diff --git a/README.md b/README.md index 546de18..c5aa93f 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.2 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.2 | x86_64 | ✅ | +| MacOS | 3.2.2 | aarch64 (arm64)| ✅ | +| Linux | 3.2.2 | x86_64 | ✅ | +| Linux | 3.2.2 | aarch64 (arm64)| ✅ | +| Windows| 3.2.2 | x86_64 | ✅ | +| Windows| 3.2.2 | x86 | ✅ | +| Windows| 3.2.2 | aarch64 (arm64)| 🚧 | 🚧 - Tested under emulation mode x86 / x86_64 in Windows on ARM diff --git a/RELEASING.md b/RELEASING.md index aefd1fa..5de2e0f 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.2 #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..7e5b242 100644 --- a/packaging/Gemfile.lock +++ b/packaging/Gemfile.lock @@ -2,25 +2,25 @@ GEM remote: http://rubygems.org/ specs: awesome_print (1.9.2) - diff-lcs (1.5.1) + base64 (0.2.0) + diff-lcs (1.5.0) dig_rb (1.0.1) expgen (0.1.1) parslet - faraday (2.9.0) - faraday-net_http (>= 2.0, < 3.2) - faraday-net_http (3.1.0) - net-http + faraday (2.7.12) + base64 + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-net_http (3.0.2) faraday-retry (2.2.0) faraday (~> 2.0) find_a_port (1.0.1) 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) - uri pact (1.64.0) pact-mock_service (~> 3.0, >= 3.3.1) pact-support (~> 1.16, >= 1.16.9) @@ -74,21 +74,22 @@ GEM rack (>= 1.3) rainbow (3.1.1) rake (13.1.0) - rspec (3.13.0) - rspec-core (~> 3.13.0) - rspec-expectations (~> 3.13.0) - rspec-mocks (~> 3.13.0) - rspec-core (3.13.0) - rspec-support (~> 3.13.0) - rspec-expectations (3.13.0) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.13.0) - rspec-mocks (3.13.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.13.0) - rspec-support (3.13.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) + ruby2_keywords (0.0.5) sync (0.5.0) table_print (1.5.7) term-ansicolor (1.7.1) @@ -96,27 +97,18 @@ GEM thor (1.3.0) tins (1.32.1) sync - uri (0.13.0) webrick (1.8.1) PLATFORMS aarch64-linux - arm64-darwin arm64-darwin-20 arm64-darwin-21 arm64-darwin-22 - arm64-darwin-23 ruby x64-mingw32 - x86_64-darwin - x86_64-darwin-20 - x86_64-darwin-21 - x86_64-darwin-22 - x86_64-darwin-23 - 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) @@ -126,4 +118,4 @@ DEPENDENCIES webrick (= 1.8.1) BUNDLED WITH - 2.5.3 + 2.4.0 diff --git a/packaging/README.md.template b/packaging/README.md.template index 1476781..ac798c2 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.2 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.2 | x86_64 | ✅ | +| MacOS | 3.2.2 | aarch64 (arm64)| ✅ | +| Linux | 3.2.2 | x86_64 | ✅ | +| Linux | 3.2.2 | aarch64 (arm64)| ✅ | +| Windows| 3.2.2 | x86_64 | ✅ | +| Windows| 3.2.2 | x86 | ✅ | +| Windows| 3.2.2 | 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..b4bf2b5 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 = "20230605-3.2.2" 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.2, because that's what Traveling Ruby uses." end sh "rm -rf build/tmp" sh "mkdir -p build/tmp"