diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 62d92bd..bf5a6b8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,9 +11,9 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 - - uses: ruby/setup-ruby@v1.180.0 + - uses: ruby/setup-ruby@v1.194.0 with: - ruby-version: 3.3.3 + ruby-version: 3.3.5 - name: Set up environment run: bundle install - name: Build diff --git a/.github/workflows/manual_release.yml b/.github/workflows/manual_release.yml index 712cb74..b62379f 100644 --- a/.github/workflows/manual_release.yml +++ b/.github/workflows/manual_release.yml @@ -33,9 +33,9 @@ jobs: with: fetch-depth: 0 - - uses: ruby/setup-ruby@v1.180.0 + - uses: ruby/setup-ruby@v1.194.0 with: - ruby-version: 3.3.3 + ruby-version: 3.3.5 - name: Set up environment run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6c5d000..a2822ee 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,9 +13,9 @@ jobs: with: fetch-depth: 0 - - uses: ruby/setup-ruby@v1.180.0 + - uses: ruby/setup-ruby@v1.194.0 with: - ruby-version: 3.3.3 + ruby-version: 3.3.5 - name: Set up environment run: | diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index a4a2f41..9a35ba9 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -13,9 +13,9 @@ jobs: with: fetch-depth: 0 - - uses: ruby/setup-ruby@v1.180.0 + - uses: ruby/setup-ruby@v1.194.0 with: - ruby-version: 3.3.3 + ruby-version: 3.3.5 - name: Set up environment run: | diff --git a/DEVELOPING.md b/DEVELOPING.md index cec794f..3c35358 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.3' - bash -c './build-ruby -a x86 -r 3.3.3 cache output/3.3.3' - bash -c './package -r traveling-ruby-20230428-3.3.3-x86-windows.tar.gz output/3.3.3' + bash -c 'mkdir -p cache output/3.3.5' + bash -c './build-ruby -a x86 -r 3.3.5 cache output/3.3.5' + bash -c './package -r traveling-ruby-20230428-3.3.5-x86-windows.tar.gz output/3.3.5' For windows x86 - bash -c 'mkdir -p cache output/3.3.3' - bash -c './build-ruby -a x86_64 -r 3.3.3 cache output/3.3.3' - bash -c './package -r traveling-ruby-20230428-3.3.3-x86_64-windows.tar.gz output/3.3.3' + bash -c 'mkdir -p cache output/3.3.5' + bash -c './build-ruby -a x86_64 -r 3.3.5 cache output/3.3.5' + bash -c './package -r traveling-ruby-20230428-3.3.5-x86_64-windows.tar.gz output/3.3.5' ### 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.3-linux-arm64.tar.gz` + 1. `traveling-ruby-20230508-3.3.5-linux-arm64.tar.gz` ```ruby - TRAVELING_RUBY_VERSION = "20230508-3.3.3" + TRAVELING_RUBY_VERSION = "20230508-3.3.5" ``` 4. Run `bundle exec rake package` as before @@ -130,13 +130,13 @@ Build only selected platforms | OS | Ruby | Architecture | Supported | | -------| ------- | ------------ | --------- | -| OSX | 3.3.3 | x86_64 | ✅ | -| OSX | 3.3.3 | aarch64 (arm)| ✅ | -| Linux | 3.3.3 | x86_64 | ✅ | -| Linux | 3.3.3 | aarch64 (arm)| ✅ | -| Windows| 3.3.3 | x86_64 | ✅ | -| Windows| 3.3.3 | x86 | ✅ | -| Windows| 3.3.3 | aarch64 (via x86 emulation) | ✅ | +| OSX | 3.3.5 | x86_64 | ✅ | +| OSX | 3.3.5 | aarch64 (arm)| ✅ | +| Linux | 3.3.5 | x86_64 | ✅ | +| Linux | 3.3.5 | aarch64 (arm)| ✅ | +| Windows| 3.3.5 | x86_64 | ✅ | +| Windows| 3.3.5 | x86 | ✅ | +| Windows| 3.3.5 | aarch64 (via x86 emulation) | ✅ | ## Testing diff --git a/Dockerfile-package-base b/Dockerfile-package-base index 29e3725..6043966 100644 --- a/Dockerfile-package-base +++ b/Dockerfile-package-base @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 ruby:3.3.3-slim +FROM --platform=linux/amd64 ruby:3.3.5-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.9 +RUN gem install bundler:2.5.18 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 7fc560e..b9fb6d5 100644 --- a/Dockerfile-release-base +++ b/Dockerfile-release-base @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 ruby:3.3.3-alpine +FROM --platform=linux/amd64 ruby:3.3.5-alpine # Installation path ENV HOME=/app diff --git a/Gemfile.lock b/Gemfile.lock index 9c05a77..d81331c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -31,4 +31,4 @@ DEPENDENCIES rake (~> 12.3) BUNDLED WITH - 2.5.9 + 2.5.18 diff --git a/README.md b/README.md index 792782f..ace6ebf 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.3 is provided in the distributable. +Ruby is not required on the host platform, Ruby 3.3.5 is provided in the distributable. | OS | Ruby | Architecture | Supported | | -------| ------- | ------------ | --------- | -| MacOS | 3.3.3 | x86_64 | ✅ | -| MacOS | 3.3.3 | aarch64 (arm64)| ✅ | -| Linux | 3.3.3 | x86_64 | ✅ | -| Linux | 3.3.3 | aarch64 (arm64)| ✅ | -| Windows| 3.3.3 | x86_64 | ✅ | -| Windows| 3.3.3 | x86 | ✅ | -| Windows| 3.3.3 | aarch64 (arm64)| 🚧 | +| MacOS | 3.3.5 | x86_64 | ✅ | +| MacOS | 3.3.5 | aarch64 (arm64)| ✅ | +| Linux | 3.3.5 | x86_64 | ✅ | +| Linux | 3.3.5 | aarch64 (arm64)| ✅ | +| Windows| 3.3.5 | x86_64 | ✅ | +| Windows| 3.3.5 | x86 | ✅ | +| Windows| 3.3.5 | aarch64 (arm64)| 🚧 | 🚧 - Tested under emulation mode x86 / x86_64 in Windows on ARM diff --git a/RELEASING.md b/RELEASING.md index 0b2618a..6d63ce6 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -2,5 +2,5 @@ Run: - chruby 3.3.3 #or whatever your version manager is + chruby 3.3.5 #or whatever your version manager is script/release.sh [major|minor|patch] # default is minor diff --git a/packaging/Gemfile.lock b/packaging/Gemfile.lock index 44191b6..2d4886d 100644 --- a/packaging/Gemfile.lock +++ b/packaging/Gemfile.lock @@ -136,4 +136,4 @@ DEPENDENCIES webrick (= 1.8.2) BUNDLED WITH - 2.5.9 + 2.5.18 diff --git a/packaging/README.md.template b/packaging/README.md.template index fa92f82..23809ba 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.3 is provided in the distributable. +Ruby is not required on the host platform, Ruby 3.3.5 is provided in the distributable. | OS | Ruby | Architecture | Supported | | -------| ------- | ------------ | --------- | -| MacOS | 3.3.3 | x86_64 | ✅ | -| MacOS | 3.3.3 | aarch64 (arm64)| ✅ | -| Linux | 3.3.3 | x86_64 | ✅ | -| Linux | 3.3.3 | aarch64 (arm64)| ✅ | -| Windows| 3.3.3 | x86_64 | ✅ | -| Windows| 3.3.3 | x86 | ✅ | -| Windows| 3.3.3 | aarch64 (arm64)| 🚧 | +| MacOS | 3.3.5 | x86_64 | ✅ | +| MacOS | 3.3.5 | aarch64 (arm64)| ✅ | +| Linux | 3.3.5 | x86_64 | ✅ | +| Linux | 3.3.5 | aarch64 (arm64)| ✅ | +| Windows| 3.3.5 | x86_64 | ✅ | +| Windows| 3.3.5 | x86 | ✅ | +| Windows| 3.3.5 | aarch64 (arm64)| 🚧 | 🚧 - Tested under emulation mode x86 / x86_64 in Windows on ARM diff --git a/tasks/package.rake b/tasks/package.rake index 0fa4a5b..e9d802f 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 = "20240615-3.3.3" +TRAVELING_RUBY_VERSION = "20240904-3.3.5" TRAVELING_RUBY_PKG_DATE = TRAVELING_RUBY_VERSION.split("-").first PLUGIN_CLI_VERSION = "0.1.2" @@ -47,7 +47,7 @@ namespace :package do 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.3, because that's what Traveling Ruby uses." + abort "You can only 'bundle install' using Ruby 3.3.5, because that's what Traveling Ruby uses." end sh "rm -rf build/tmp" sh "mkdir -p build/tmp"