From f826e719be5c3c8b4a13410051599a9174d526bc Mon Sep 17 00:00:00 2001 From: ecentell-CPF <41970563+ecentell-CPF@users.noreply.github.com> Date: Wed, 3 Jan 2024 14:21:49 -0600 Subject: [PATCH 1/4] Add Ruby 3.3 to the cross compile list Add Ruby 3.3 to the cross compile list --- .circleci/config.yml | 1 + CHANGELOG.md | 3 +++ Rakefile | 2 +- VERSION | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 18f95277..e38bef3e 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -392,6 +392,7 @@ workflows: - '3.0' - '3.1' - '3.2' + - '3.3' - test_linux: matrix: *ruby_versions diff --git a/CHANGELOG.md b/CHANGELOG.md index 7350886c..b0572bb3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 2.1.7.Pre +* Add Ruby 3.3 to the cross compile list + ## 2.1.6 * Add Ruby 3.0, 3.1, and 3.2 to the cross compile list diff --git a/Rakefile b/Rakefile index 654dfa59..16318bd0 100644 --- a/Rakefile +++ b/Rakefile @@ -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.2.0:3.1.0".freeze +ruby_cc_ucrt_versions = "3.3.0:3.2.0:3.1.0".freeze ruby_cc_mingw32_versions = "3.0.0:2.7.0:2.6.0:2.5.0:2.4.0".freeze GEM_PLATFORM_HOSTS = { diff --git a/VERSION b/VERSION index 399088bf..187330c5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1.6 +2.1.7.Pre From 1ff5039b1d117305d68b94aed44eed97eeaffe6b Mon Sep 17 00:00:00 2001 From: ecentell-CPF <41970563+ecentell-CPF@users.noreply.github.com> Date: Wed, 3 Jan 2024 18:18:08 -0600 Subject: [PATCH 2/4] Update rake-compiler-dock Update rake-compiler-dock --- .circleci/config.yml | 2 +- tiny_tds.gemspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e38bef3e..eb7a3d6e 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -243,7 +243,7 @@ jobs: type: string docker: - - image: "ghcr.io/rake-compiler/rake-compiler-dock-image:1.3.0-mri-<< parameters.platform >>" + - image: "ghcr.io/rake-compiler/rake-compiler-dock-image:1.4.0-mri-<< parameters.platform >>" steps: - checkout diff --git a/tiny_tds.gemspec b/tiny_tds.gemspec index 7afb4970..9d2fb87c 100644 --- a/tiny_tds.gemspec +++ b/tiny_tds.gemspec @@ -23,7 +23,7 @@ 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.3.0' + s.add_development_dependency 'rake-compiler-dock', '~> 1.4.0' s.add_development_dependency 'minitest', '~> 5.14.0' s.add_development_dependency 'minitest-ci', '~> 3.4.0' s.add_development_dependency 'connection_pool', '~> 2.2.0' From 8cd1ed7edd48d8778c86824fbd68103829f653af Mon Sep 17 00:00:00 2001 From: ecentell-CPF <41970563+ecentell-CPF@users.noreply.github.com> Date: Thu, 4 Jan 2024 11:05:13 -0600 Subject: [PATCH 3/4] Update config.yml Attempted fix for 3.0 being found in 3.3.0 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index eb7a3d6e..171d0d6d 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,7 +23,7 @@ commands: $ProgressPreference='SilentlyContinue' $uri = 'https://api.github.com/repos/oneclick/rubyinstaller2/tags?per_page=200' - $releases = ((Invoke-WebRequest $uri) | ConvertFrom-Json).name | select-string -Pattern '<< parameters.ruby_version >>' + $releases = ((Invoke-WebRequest $uri) | ConvertFrom-Json).name | select-string (-join("RubyInstaller-" , "<< parameters.ruby_version >>" )) $target_release = (($releases | Sort-Object -Descending)[0] | Out-String).Trim() $target_version = $target_release.Substring($target_release.Length - 7) $download_uri = "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-$target_version/rubyinstaller-devkit-$target_version-x64.exe" From 2211c3986454918b2c4aadaa4825f7f1386049f7 Mon Sep 17 00:00:00 2001 From: ecentell-CPF <41970563+ecentell-CPF@users.noreply.github.com> Date: Thu, 4 Jan 2024 15:21:32 -0600 Subject: [PATCH 4/4] Final Approval --- CHANGELOG.md | 2 +- VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b0572bb3..9c59f245 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 2.1.7.Pre +## 2.1.7 * Add Ruby 3.3 to the cross compile list ## 2.1.6 diff --git a/VERSION b/VERSION index 187330c5..04b10b4f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1.7.Pre +2.1.7