Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: drop traveling-ruby to 3.2.3 due to segfaults on alpine #131

Merged
merged 1 commit into from
Feb 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.3.0
ruby-version: 3.2.3
- 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.3.0
ruby-version: 3.2.3

- 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.3.0
ruby-version: 3.2.3

- 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.3.0
ruby-version: 3.2.3

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

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.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
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-bundle-base
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-package-base
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-release-base
Original file line number Diff line number Diff line change
@@ -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
Expand Down
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.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

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.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
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.7.1"
gem "json", "2.6.3"
4 changes: 2 additions & 2 deletions packaging/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
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.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

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 = "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"

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\.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"
Expand Down
Loading