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.

Sign up for GitHub

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

Add Ruby 3.4 to the cross compile list #573

Merged
merged 3 commits into from
Dec 30, 2024
Merged

Add Ruby 3.4 to the cross compile list #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f822f0
Add Ruby 3.4 to the cross compile list
andyundso Dec 25, 2024
f7b86b0
Update minitest version
andyundso Dec 25, 2024
34e55ed
Properly pin minitest version
andyundso Dec 30, 2024
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
11 changes: 9 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
name: cross-compile-windows
runs-on: ubuntu-22.04
container:
image: "ghcr.io/rake-compiler/rake-compiler-dock-image:1.4.0-mri-${{ matrix.platform }}"
image: "ghcr.io/rake-compiler/rake-compiler-dock-image:1.7.0-mri-${{ matrix.platform }}"
steps:
- uses: actions/checkout@v4

Expand Down Expand Up @@ -181,6 +181,7 @@ jobs:
- "3.1"
- "3.2"
- "3.3"
- "3.4"

name: install-windows-ucrt
runs-on: windows-latest
Expand Down Expand Up @@ -230,6 +231,8 @@ jobs:
- "3.1"
- "3.2"
- "3.3"
- "3.4"

name: test-windows-ucrt
runs-on: windows-latest
steps:
Expand Down Expand Up @@ -305,6 +308,7 @@ jobs:
- "3.1"
- "3.2"
- "3.3"
- "3.4"

name: install-windows-native
runs-on: windows-latest
Expand Down Expand Up @@ -340,7 +344,7 @@ jobs:

- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.3
ruby-version: 3.4
bundler-cache: true

- name: Write used versions into file
Expand Down Expand Up @@ -376,6 +380,8 @@ jobs:
- "3.1"
- "3.2"
- "3.3"
- "3.4"

runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -439,6 +445,7 @@ jobs:
- "3.1"
- "3.2"
- "3.3"
- "3.4"

name: install-macos-m1
runs-on: macos-14
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 3.1.0

* Add Ruby 3.4 to the cross compile list

## 3.0.0

* Drop support for Ruby < 2.7
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require_relative './ext/tiny_tds/extconsts'

SPEC = Gem::Specification.load(File.expand_path('../tiny_tds.gemspec', __FILE__))

ruby_cc_ucrt_versions = "3.3.0:3.2.0:3.1.0".freeze
ruby_cc_ucrt_versions = "3.4.0:3.3.5:3.2.0:3.1.0".freeze
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since 3.3.0 became 3.3.5, do we also want to update to 3.1.6 & 3.2.6?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change to 3.3.5 comes from the v1.6.0 release notes of rake-compiler-dock:
https://github.com/rake-compiler/rake-compiler-dock/releases/tag/v1.6.0

looking at how nokogiri configured their cross-compilation list, it appears to not be necessary to update any other version:
https://github.com/sparklemotion/nokogiri/blob/dadec3409556be85aecf9eff3857b883cacbe563/.cross_rubies

ruby_cc_mingw32_versions = "3.0.0:2.7.0".freeze

GEM_PLATFORM_HOSTS = {
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.0
3.1.0
2 changes: 1 addition & 1 deletion test/gem_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
require 'test_helper'
require 'tiny_tds/gem'

class GemTest < MiniTest::Spec
class GemTest < Minitest::Spec
gem_root ||= File.expand_path '../..', __FILE__

describe TinyTds::Gem do
Expand Down
2 changes: 1 addition & 1 deletion test/test_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
TINYTDS_SCHEMAS = ['sqlserver_2017', 'sqlserver_azure'].freeze

module TinyTds
class TestCase < MiniTest::Spec
class TestCase < Minitest::Spec

class << self

Expand Down
4 changes: 2 additions & 2 deletions tiny_tds.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ Gem::Specification.new do |s|
s.add_development_dependency 'mini_portile2', '~> 2.5.0'
s.add_development_dependency 'rake', '~> 13.0.0'
s.add_development_dependency 'rake-compiler', '~> 1.2'
s.add_development_dependency 'rake-compiler-dock', '~> 1.4.0'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What changed here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • v1.5: Support for compiling gems against musl (Alpine's "glibc" library)
  • v1.6: Base images are now based on Ubuntu, therefore some libraries were upgraded.
  • v1.7: Support for compiling gems against Ruby 3.4

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The release notes here say the minimum glibc version was incremented; does that mean our minimum version of linux/glibc is also bumped for our linux releases? or is that just for the build system for windows?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that is just for the build system on Windows.

s.add_development_dependency 'minitest', '~> 5.14.0'
s.add_development_dependency 'rake-compiler-dock', '~> 1.7.0'
s.add_development_dependency 'minitest', '~> 5.25'
s.add_development_dependency 'minitest-reporters', '~> 1.6.1'
s.add_development_dependency 'connection_pool', '~> 2.2.0'
s.add_development_dependency 'toxiproxy', '~> 2.0.0'
Expand Down