From 5da8f7655a561f9896395f24ab9acf03d5879685 Mon Sep 17 00:00:00 2001 From: aharpervc Date: Fri, 31 Jan 2020 13:30:37 -0500 Subject: [PATCH 1/3] Remove old Ruby versions from CI config & cross compile rake task --- .travis.yml | 1 - tasks/native_gem.rake | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6d0fd2fc..4407031f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,6 @@ env: - TESTOPTS="-v" - TINYTDS_UNIT_HOST=localhost rvm: - - 2.3.8 - 2.4.5 - 2.5.3 - 2.6.1 diff --git a/tasks/native_gem.rake b/tasks/native_gem.rake index 3af6f53e..192ee772 100644 --- a/tasks/native_gem.rake +++ b/tasks/native_gem.rake @@ -8,7 +8,7 @@ task 'gem:windows' => ['ports:cross'] do build = ['bundle'] # and finally build the native gem - build << 'rake cross native gem RUBY_CC_VERSION=2.5.0:2.4.0:2.3.0:2.2.2:2.1.6:2.0.0 CFLAGS="-Wall" MAKE="make -j`nproc`"' + build << 'rake cross native gem RUBY_CC_VERSION=2.5.0:2.4.0 CFLAGS="-Wall" MAKE="make -j`nproc`"' RakeCompilerDock.sh build.join(' && ') end From 33d2189bd9fd10993d9d22232782dd3f59e4f07a Mon Sep 17 00:00:00 2001 From: aharpervc Date: Fri, 7 Feb 2020 10:10:41 -0500 Subject: [PATCH 2/3] Add Ruby 2.6 to the cross compile list --- tasks/native_gem.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/native_gem.rake b/tasks/native_gem.rake index 192ee772..a9044819 100644 --- a/tasks/native_gem.rake +++ b/tasks/native_gem.rake @@ -8,7 +8,7 @@ task 'gem:windows' => ['ports:cross'] do build = ['bundle'] # and finally build the native gem - build << 'rake cross native gem RUBY_CC_VERSION=2.5.0:2.4.0 CFLAGS="-Wall" MAKE="make -j`nproc`"' + build << 'rake cross native gem RUBY_CC_VERSION=2.6.0:2.5.0:2.4.0 CFLAGS="-Wall" MAKE="make -j`nproc`"' RakeCompilerDock.sh build.join(' && ') end From e75a3797f435c988907844ce933db25f71799889 Mon Sep 17 00:00:00 2001 From: aharpervc Date: Tue, 4 Feb 2020 16:31:18 -0500 Subject: [PATCH 3/3] Update readme --- CHANGELOG.md | 6 ++++++ README.md | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc7bf28e..2592b4c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## (unreleased) + +* Removed old/unused appveyor config +* Remove old Rubies from CI & cross compile list +* Add Ruby 2.6 to the cross compile list + ## 2.1.2 * Use Kernel.BigDecimal vs BigDecimal.new. Fixes #409. diff --git a/README.md b/README.md index 947f51c3..9deffa8f 100644 --- a/README.md +++ b/README.md @@ -401,7 +401,7 @@ The default is true and since FreeTDS v1.0 would do this as well. ## Compiling Gems for Windows -For the convenience of Windows users, TinyTDS ships pre-compiled gems for Ruby 2.0, 2.1, 2.2, and 2.3 on Windows. In order to generate these gems, [rake-compiler-dock](https://github.com/rake-compiler/rake-compiler-dock) is used. This project provides a [Docker image](https://registry.hub.docker.com/u/larskanis/rake-compiler-dock/) with rvm, cross-compilers and a number of different target versions of Ruby. +For the convenience of Windows users, TinyTDS ships pre-compiled gems for supported versions of Ruby on Windows. In order to generate these gems, [rake-compiler-dock](https://github.com/rake-compiler/rake-compiler-dock) is used. This project provides a [Docker image](https://registry.hub.docker.com/u/larskanis/rake-compiler-dock/) with rvm, cross-compilers and a number of different target versions of Ruby. Run the following rake task to compile the gems for Windows. This will check the availability of [Docker](https://www.docker.com/) (and boot2docker on Windows or OS-X) and will give some advice for download and installation. When docker is running, it will download the docker image (once-only) and start the build: