Skip to content

Commit

Permalink
chore(deps): upgrade traveling-ruby to 20240205-3.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
YOU54F committed Feb 6, 2024
1 parent 8418933 commit 87ee836
Show file tree
Hide file tree
Showing 15 changed files with 86 additions and 76 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v3
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.2
ruby-version: 3.3.0
- name: Set up environment
run: bundle install
- name: Build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.2
ruby-version: 3.3.0

- name: Set up environment
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.2
ruby-version: 3.3.0

- name: Set up environment
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.2
ruby-version: 3.3.0

- name: Set up environment
run: |
Expand Down
30 changes: 15 additions & 15 deletions DEVELOPING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.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'
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'

For windows x86

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'
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'

### Building the pact-ruby-standalone packages

Expand Down Expand Up @@ -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.2.2-linux-arm64.tar.gz`
1. `traveling-ruby-20230508-3.3.0-linux-arm64.tar.gz`

```ruby
TRAVELING_RUBY_VERSION = "20230508-3.2.2"
TRAVELING_RUBY_VERSION = "20230508-3.3.0"
```

4. Run `bundle exec rake package` as before
Expand All @@ -130,13 +130,13 @@ Build only selected platforms

| OS | Ruby | Architecture | Supported |
| -------| ------- | ------------ | --------- |
| 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) ||
| 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) ||

## Testing

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile-bundle-base
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=linux/amd64 ruby:3.2.2-alpine
FROM --platform=linux/amd64 ruby:3.3.0-alpine

# Installation path
ENV HOME=/app
Expand All @@ -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.4"
RUN gem install bundler -v "~> 2.5"
COPY packaging/Gemfile packaging/Gemfile.lock $HOME/
RUN bundle install --no-cache
4 changes: 2 additions & 2 deletions Dockerfile-package-base
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=linux/amd64 ruby:3.2.2-slim
FROM --platform=linux/amd64 ruby:3.3.0-slim

RUN apt-get update && apt-get install -y \
curl \
Expand All @@ -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.4.0
RUN gem install bundler:2.5.3
RUN bundle install
COPY Rakefile README.md Gemfile Gemfile.lock VERSION $HOME/
COPY tasks $HOME/tasks
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile-release-base
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=linux/amd64 ruby:3.2.2-alpine
FROM --platform=linux/amd64 ruby:3.3.0-alpine

# Installation path
ENV HOME=/app
Expand All @@ -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.4"
RUN gem install bundler -v "~> 2.5"
COPY Gemfile Gemfile.lock $HOME/
RUN bundle install --no-cache
18 changes: 10 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
GEM
remote: http://rubygems.org/
specs:
addressable (2.8.3)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
bump (0.10.0)
conventional-changelog (1.3.0)
faraday (2.7.4)
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday-net_http (3.0.2)
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
octokit (4.25.1)
faraday (>= 1, < 3)
sawyer (~> 0.9)
public_suffix (5.0.1)
public_suffix (5.0.4)
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
Expand All @@ -29,4 +31,4 @@ DEPENDENCIES
rake (~> 12.3)

BUNDLED WITH
2.4.10
2.5.3
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,17 @@ See the [release page][releases].

## Supported Platforms

Ruby is not required on the host platform, Ruby 3.2.2 is provided in the distributable.
Ruby is not required on the host platform, Ruby 3.3.0 is provided in the distributable.

| OS | Ruby | Architecture | Supported |
| -------| ------- | ------------ | --------- |
| 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)| 🚧 |
| 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)| 🚧 |

🚧 - Tested under emulation mode x86 / x86_64 in Windows on ARM

Expand Down
2 changes: 1 addition & 1 deletion RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

Run:

chruby 3.2.2 #or whatever your version manager is
chruby 3.3.0 #or whatever your version manager is
script/release.sh [major|minor|patch] # default is minor
2 changes: 1 addition & 1 deletion packaging/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.6.3"
gem "json", "2.7.1"
52 changes: 30 additions & 22 deletions packaging/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@ GEM
remote: http://rubygems.org/
specs:
awesome_print (1.9.2)
base64 (0.2.0)
diff-lcs (1.5.0)
diff-lcs (1.5.1)
dig_rb (1.0.1)
expgen (0.1.1)
parslet
faraday (2.7.12)
base64
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday-net_http (3.0.2)
faraday (2.9.0)
faraday-net_http (>= 2.0, < 3.2)
faraday-net_http (3.1.0)
net-http
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.6.3)
json (2.7.1)
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)
Expand Down Expand Up @@ -74,41 +74,49 @@ GEM
rack (>= 1.3)
rainbow (3.1.1)
rake (13.1.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)
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)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.6)
rspec-support (~> 3.13.0)
rspec-mocks (3.13.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-support (3.12.1)
rspec-support (~> 3.13.0)
rspec-support (3.13.0)
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)
tins (~> 1.0)
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.6.3)
json (= 2.7.1)
pact (= 1.64.0)
pact-message (= 0.11.1)
pact-mock_service (= 3.11.2)
Expand All @@ -118,4 +126,4 @@ DEPENDENCIES
webrick (= 1.8.1)

BUNDLED WITH
2.4.0
2.5.3
16 changes: 8 additions & 8 deletions packaging/README.md.template
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,17 @@ See the [release page][releases].

## Supported Platforms

Ruby is not required on the host platform, Ruby 3.2.2 is provided in the distributable.
Ruby is not required on the host platform, Ruby 3.3.0 is provided in the distributable.

| OS | Ruby | Architecture | Supported |
| -------| ------- | ------------ | --------- |
| 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)| 🚧 |
| 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)| 🚧 |

🚧 - Tested under emulation mode x86 / x86_64 in Windows on ARM

Expand Down
6 changes: 3 additions & 3 deletions tasks/package.rake
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ require 'bundler/setup'

PACKAGE_NAME = "pact"
VERSION = File.read('VERSION').strip
TRAVELING_RUBY_VERSION = "20230605-3.2.2"
TRAVELING_RUBY_VERSION = "20240205-3.3.0"
TRAVELING_RUBY_PKG_DATE = TRAVELING_RUBY_VERSION.split("-").first
PLUGIN_CLI_VERSION = "0.1.0"

Expand Down Expand Up @@ -46,8 +46,8 @@ namespace :package do
end
desc "Install gems to local directory"
task :bundle_install do
if RUBY_VERSION !~ /^3\.2\./
abort "You can only 'bundle install' using Ruby 3.2.2, because that's what Traveling Ruby uses."
if RUBY_VERSION !~ /^3\.3\./
abort "You can only 'bundle install' using Ruby 3.3.0, because that's what Traveling Ruby uses."
end
sh "rm -rf build/tmp"
sh "mkdir -p build/tmp"
Expand Down

0 comments on commit 87ee836

Please sign in to comment.