aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2017-11-04 00:01:11 -0700
committerSteven Fackler <[email protected]>2017-11-04 00:01:11 -0700
commit97b046bf4f3959a17cb8da44f6b7e627e54ac328 (patch)
tree456b66c3074ad9b92e97ea5b66b6d18fe7808681
parentMerge pull request #758 from bvinc/want_read_typo (diff)
downloadrust-openssl-97b046bf4f3959a17cb8da44f6b7e627e54ac328.tar.xz
rust-openssl-97b046bf4f3959a17cb8da44f6b7e627e54ac328.zip
Bump CI openssl versions
Also remove caching in appveyor to deal with corruption issue
-rw-r--r--.circleci/config.yml4
-rw-r--r--appveyor.yml12
2 files changed, 6 insertions, 10 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 39ef6c53..f20f866a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -68,10 +68,10 @@ job: &JOB
openssl_110: &OPENSSL_110
LIBRARY: openssl
- VERSION: 1.1.0f
+ VERSION: 1.1.0g
openssl_102: &OPENSSL_102
LIBRARY: openssl
- VERSION: 1.0.2l
+ VERSION: 1.0.2m
openssl_101: &OPENSSL_101
LIBRARY: openssl
VERSION: 1.0.1u
diff --git a/appveyor.yml b/appveyor.yml
index d9ba7558..bae5d621 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,20 +5,20 @@ environment:
- TARGET: i686-pc-windows-gnu
BITS: 32
MSYS2: 1
- OPENSSL_VERSION: 1_1_0f
+ OPENSSL_VERSION: 1_1_0g
- TARGET: x86_64-pc-windows-msvc
BITS: 64
- OPENSSL_VERSION: 1_1_0f
+ OPENSSL_VERSION: 1_1_0g
OPENSSL_DIR: C:\OpenSSL
# 1.0.2, 64/32 bit
- TARGET: x86_64-pc-windows-gnu
BITS: 64
MSYS2: 1
- OPENSSL_VERSION: 1_0_2L
+ OPENSSL_VERSION: 1_0_2m
- TARGET: i686-pc-windows-msvc
BITS: 32
- OPENSSL_VERSION: 1_0_2L
+ OPENSSL_VERSION: 1_0_2m
OPENSSL_DIR: C:\OpenSSL
- TARGET: x86_64-pc-windows-msvc
VCPKG_DEFAULT_TRIPLET: x64-windows
@@ -48,7 +48,3 @@ build: false
test_script:
- cargo run --manifest-path systest/Cargo.toml --target %TARGET%
- cargo test --manifest-path openssl/Cargo.toml --target %TARGET%
-
-cache:
- - target
- - C:\Users\appveyor\.cargo\registry