Merge pull request #888 from sfackler/version-bumps

Upgrade 1.1.0 and 1.0.2 test versions
This commit is contained in:
Steven Fackler 2018-03-29 09:53:32 +02:00 committed by GitHub
commit 598b326f61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions

View File

@ -94,10 +94,10 @@ openssl_111: &OPENSSL_111
VERSION: 1.1.1-pre2
openssl_110: &OPENSSL_110
LIBRARY: openssl
VERSION: 1.1.0g
VERSION: 1.1.0h
openssl_102: &OPENSSL_102
LIBRARY: openssl
VERSION: 1.0.2n
VERSION: 1.0.2o
openssl_101: &OPENSSL_101
LIBRARY: openssl
VERSION: 1.0.1u

View File

@ -5,20 +5,20 @@ environment:
- TARGET: i686-pc-windows-gnu
BITS: 32
MSYS2: 1
OPENSSL_VERSION: 1_1_0g
OPENSSL_VERSION: 1_1_0h
- TARGET: x86_64-pc-windows-msvc
BITS: 64
OPENSSL_VERSION: 1_1_0g
OPENSSL_VERSION: 1_1_0h
OPENSSL_DIR: C:\OpenSSL
# 1.0.2, 64/32 bit
- TARGET: x86_64-pc-windows-gnu
BITS: 64
MSYS2: 1
OPENSSL_VERSION: 1_0_2n
OPENSSL_VERSION: 1_0_2o
- TARGET: i686-pc-windows-msvc
BITS: 32
OPENSSL_VERSION: 1_0_2n
OPENSSL_VERSION: 1_0_2o
OPENSSL_DIR: C:\OpenSSL
- TARGET: x86_64-pc-windows-msvc
VCPKG_DEFAULT_TRIPLET: x64-windows