Skip to content

Commit 890cc5e

Browse files
YOU54FYOU54F
authored
Merge pull request #151 from pact-foundation/deps/ruby_3.3.5
chore(deps): update to use Ruby 3.3.5
2 parents 68441bb + a8da9fe commit 890cc5e

13 files changed

+47
-47
lines changed

‎.github/workflows/build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111
runs-on: ${{ matrix.os }}
1212
steps:
1313
- uses: actions/checkout@v3
14-
- uses: ruby/setup-ruby@v1.180.0
14+
- uses: ruby/setup-ruby@v1.194.0
1515
with:
16-
ruby-version: 3.3.3
16+
ruby-version: 3.3.5
1717
- name: Set up environment
1818
run: bundle install
1919
- name: Build

‎.github/workflows/manual_release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ jobs:
3333
with:
3434
fetch-depth: 0
3535

36-
- uses: ruby/setup-ruby@v1.180.0
36+
- uses: ruby/setup-ruby@v1.194.0
3737
with:
38-
ruby-version: 3.3.3
38+
ruby-version: 3.3.5
3939

4040
- name: Set up environment
4141
run: |

‎.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
with:
1414
fetch-depth: 0
1515

16-
- uses: ruby/setup-ruby@v1.180.0
16+
- uses: ruby/setup-ruby@v1.194.0
1717
with:
18-
ruby-version: 3.3.3
18+
ruby-version: 3.3.5
1919

2020
- name: Set up environment
2121
run: |

‎.github/workflows/update.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
with:
1414
fetch-depth: 0
1515

16-
- uses: ruby/setup-ruby@v1.180.0
16+
- uses: ruby/setup-ruby@v1.194.0
1717
with:
18-
ruby-version: 3.3.3
18+
ruby-version: 3.3.5
1919

2020
- name: Set up environment
2121
run: |

‎DEVELOPING.md

+15-15
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@ Script is designed to run on Linux, but can be run on macOS or windows.
5454
For windows x86_64
5555

5656
cd windows
57-
bash -c 'mkdir -p cache output/3.3.3'
58-
bash -c './build-ruby -a x86 -r 3.3.3 cache output/3.3.3'
59-
bash -c './package -r traveling-ruby-20230428-3.3.3-x86-windows.tar.gz output/3.3.3'
57+
bash -c 'mkdir -p cache output/3.3.5'
58+
bash -c './build-ruby -a x86 -r 3.3.5 cache output/3.3.5'
59+
bash -c './package -r traveling-ruby-20230428-3.3.5-x86-windows.tar.gz output/3.3.5'
6060

6161
For windows x86
6262

63-
bash -c 'mkdir -p cache output/3.3.3'
64-
bash -c './build-ruby -a x86_64 -r 3.3.3 cache output/3.3.3'
65-
bash -c './package -r traveling-ruby-20230428-3.3.3-x86_64-windows.tar.gz output/3.3.3'
63+
bash -c 'mkdir -p cache output/3.3.5'
64+
bash -c './build-ruby -a x86_64 -r 3.3.5 cache output/3.3.5'
65+
bash -c './package -r traveling-ruby-20230428-3.3.5-x86_64-windows.tar.gz output/3.3.5'
6666

6767
### Building the pact-ruby-standalone packages
6868

@@ -118,10 +118,10 @@ Build only selected platforms
118118
2. Copy your built `traveling-ruby` package into the `build` folder
119119
3. Ensure the version number in `tasks/package.rake` matches your package name
120120
1. eg
121-
1. `traveling-ruby-20230508-3.3.3-linux-arm64.tar.gz`
121+
1. `traveling-ruby-20230508-3.3.5-linux-arm64.tar.gz`
122122

123123
```ruby
124-
TRAVELING_RUBY_VERSION = "20230508-3.3.3"
124+
TRAVELING_RUBY_VERSION = "20230508-3.3.5"
125125
```
126126

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

131131
| OS | Ruby | Architecture | Supported |
132132
| -------| ------- | ------------ | --------- |
133-
| OSX | 3.3.3 | x86_64 | ✅ |
134-
| OSX | 3.3.3 | aarch64 (arm)| ✅ |
135-
| Linux | 3.3.3 | x86_64 | ✅ |
136-
| Linux | 3.3.3 | aarch64 (arm)| ✅ |
137-
| Windows| 3.3.3 | x86_64 | ✅ |
138-
| Windows| 3.3.3 | x86 | ✅ |
139-
| Windows| 3.3.3 | aarch64 (via x86 emulation) | ✅ |
133+
| OSX | 3.3.5 | x86_64 | ✅ |
134+
| OSX | 3.3.5 | aarch64 (arm)| ✅ |
135+
| Linux | 3.3.5 | x86_64 | ✅ |
136+
| Linux | 3.3.5 | aarch64 (arm)| ✅ |
137+
| Windows| 3.3.5 | x86_64 | ✅ |
138+
| Windows| 3.3.5 | x86 | ✅ |
139+
| Windows| 3.3.5 | aarch64 (via x86 emulation) | ✅ |
140140

141141
## Testing
142142

‎Dockerfile-package-base

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=linux/amd64 ruby:3.3.3-slim
1+
FROM --platform=linux/amd64 ruby:3.3.5-slim
22

33
RUN apt-get update && apt-get install -y \
44
curl \
@@ -12,7 +12,7 @@ RUN useradd --create-home --home-dir $HOME user \
1212
&& mkdir -p $HOME \
1313
&& chown -R user:user $HOME
1414

15-
RUN gem install bundler:2.5.9
15+
RUN gem install bundler:2.5.18
1616
RUN bundle install
1717
COPY Rakefile README.md Gemfile Gemfile.lock VERSION $HOME/
1818
COPY tasks $HOME/tasks

‎Dockerfile-release-base

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=linux/amd64 ruby:3.3.3-alpine
1+
FROM --platform=linux/amd64 ruby:3.3.5-alpine
22

33
# Installation path
44
ENV HOME=/app

‎Gemfile.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ DEPENDENCIES
3131
rake (~> 12.3)
3232

3333
BUNDLED WITH
34-
2.5.9
34+
2.5.18

‎README.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,17 @@ See the [release page][releases].
4646

4747
## Supported Platforms
4848

49-
Ruby is not required on the host platform, Ruby 3.3.3 is provided in the distributable.
49+
Ruby is not required on the host platform, Ruby 3.3.5 is provided in the distributable.
5050

5151
| OS | Ruby | Architecture | Supported |
5252
| -------| ------- | ------------ | --------- |
53-
| MacOS | 3.3.3 | x86_64 | ✅ |
54-
| MacOS | 3.3.3 | aarch64 (arm64)| ✅ |
55-
| Linux | 3.3.3 | x86_64 | ✅ |
56-
| Linux | 3.3.3 | aarch64 (arm64)| ✅ |
57-
| Windows| 3.3.3 | x86_64 | ✅ |
58-
| Windows| 3.3.3 | x86 | ✅ |
59-
| Windows| 3.3.3 | aarch64 (arm64)| 🚧 |
53+
| MacOS | 3.3.5 | x86_64 | ✅ |
54+
| MacOS | 3.3.5 | aarch64 (arm64)| ✅ |
55+
| Linux | 3.3.5 | x86_64 | ✅ |
56+
| Linux | 3.3.5 | aarch64 (arm64)| ✅ |
57+
| Windows| 3.3.5 | x86_64 | ✅ |
58+
| Windows| 3.3.5 | x86 | ✅ |
59+
| Windows| 3.3.5 | aarch64 (arm64)| 🚧 |
6060

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

‎RELEASING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
Run:
44

5-
chruby 3.3.3 #or whatever your version manager is
5+
chruby 3.3.5 #or whatever your version manager is
66
script/release.sh [major|minor|patch] # default is minor

‎packaging/Gemfile.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,4 +136,4 @@ DEPENDENCIES
136136
webrick (= 1.8.2)
137137

138138
BUNDLED WITH
139-
2.5.9
139+
2.5.18

‎packaging/README.md.template

+8-8
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,17 @@ See the [release page][releases].
4646

4747
## Supported Platforms
4848

49-
Ruby is not required on the host platform, Ruby 3.3.3 is provided in the distributable.
49+
Ruby is not required on the host platform, Ruby 3.3.5 is provided in the distributable.
5050

5151
| OS | Ruby | Architecture | Supported |
5252
| -------| ------- | ------------ | --------- |
53-
| MacOS | 3.3.3 | x86_64 | ✅ |
54-
| MacOS | 3.3.3 | aarch64 (arm64)| ✅ |
55-
| Linux | 3.3.3 | x86_64 | ✅ |
56-
| Linux | 3.3.3 | aarch64 (arm64)| ✅ |
57-
| Windows| 3.3.3 | x86_64 | ✅ |
58-
| Windows| 3.3.3 | x86 | ✅ |
59-
| Windows| 3.3.3 | aarch64 (arm64)| 🚧 |
53+
| MacOS | 3.3.5 | x86_64 | ✅ |
54+
| MacOS | 3.3.5 | aarch64 (arm64)| ✅ |
55+
| Linux | 3.3.5 | x86_64 | ✅ |
56+
| Linux | 3.3.5 | aarch64 (arm64)| ✅ |
57+
| Windows| 3.3.5 | x86_64 | ✅ |
58+
| Windows| 3.3.5 | x86 | ✅ |
59+
| Windows| 3.3.5 | aarch64 (arm64)| 🚧 |
6060

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

‎tasks/package.rake

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ require 'bundler/setup'
33

44
PACKAGE_NAME = "pact"
55
VERSION = File.read('VERSION').strip
6-
TRAVELING_RUBY_VERSION = "20240615-3.3.3"
6+
TRAVELING_RUBY_VERSION = "20240904-3.3.5"
77
TRAVELING_RUBY_PKG_DATE = TRAVELING_RUBY_VERSION.split("-").first
88
PLUGIN_CLI_VERSION = "0.1.2"
99

@@ -47,7 +47,7 @@ namespace :package do
4747
desc "Install gems to local directory"
4848
task :bundle_install do
4949
if RUBY_VERSION !~ /^3\.3\./
50-
abort "You can only 'bundle install' using Ruby 3.3.3, because that's what Traveling Ruby uses."
50+
abort "You can only 'bundle install' using Ruby 3.3.5, because that's what Traveling Ruby uses."
5151
end
5252
sh "rm -rf build/tmp"
5353
sh "mkdir -p build/tmp"

0 commit comments

Comments
 (0)