diff --git a/appveyor.yml b/appveyor.yml index 66100f3a..8d27fe99 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,9 @@ init: - - SET PATH=C:\Ruby%ruby_version%\bin;%PATH% + - SET PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH% + # - SET PATH=C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin;%PATH% - SET PATH=C:\MinGW\msys\1.0\bin;%PATH% - - SET RAKEOPT=-rdevkit + # - SET PATH=C:\Perl\bin;%PATH% + # - SET RAKEOPT=-rdevkit - SET TESTOPTS='-v' clone_depth: 5 skip_tags: true @@ -39,9 +41,9 @@ environment: TINYTDS_UNIT_AZURE_PASS: secure: fYKSKV4v+36OFQp2nZdX4DfUpgmy5cm0wuR73cgdmEk= matrix: - - ruby_version: "23-x64" - - ruby_version: "23" - - ruby_version: "22-x64" - - ruby_version: "22" + - RUBY_VERSION: "23-x64" + # - RUBY_VERSION: "23" + # - RUBY_VERSION: "22-x64" + # - RUBY_VERSION: "22" on_failure: - find -name compile.log | xargs cat diff --git a/ext/tiny_tds/extconsts.rb b/ext/tiny_tds/extconsts.rb index cc2f02a0..2b216cfd 100644 --- a/ext/tiny_tds/extconsts.rb +++ b/ext/tiny_tds/extconsts.rb @@ -2,10 +2,10 @@ ICONV_VERSION = ENV['TINYTDS_ICONV_VERSION'] || "1.14" ICONV_SOURCE_URI = "http://ftp.gnu.org/pub/gnu/libiconv/libiconv-#{ICONV_VERSION}.tar.gz" -OPENSSL_VERSION = ENV['TINYTDS_OPENSSL_VERSION'] || '1.0.2j' +OPENSSL_VERSION = ENV['TINYTDS_OPENSSL_VERSION'] || '1.1.0e' OPENSSL_SOURCE_URI = "https://www.openssl.org/source/openssl-#{OPENSSL_VERSION}.tar.gz" -FREETDS_VERSION = ENV['TINYTDS_FREETDS_VERSION'] || "1.00.21" +FREETDS_VERSION = ENV['TINYTDS_FREETDS_VERSION'] || "1.00.27" FREETDS_VERSION_INFO = Hash.new { |h,k| h[k] = {files: "ftp://ftp.freetds.org/pub/freetds/stable/freetds-#{k}.tar.bz2"} } diff --git a/test/bin/install-openssl.sh b/test/bin/install-openssl.sh index 8fd11282..2745f1be 100755 --- a/test/bin/install-openssl.sh +++ b/test/bin/install-openssl.sh @@ -10,7 +10,7 @@ fi wget https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz tar -xzf openssl-$OPENSSL_VERSION.tar.gz cd openssl-$OPENSSL_VERSION -./config --prefix=/opt/local +./config --prefix=/usr/local/openssl --openssldir=/usr/local/openssl make make install cd ..