Build against modern rust by default

Add a single build against 1.24.1 to ensure back compat
This commit is contained in:
Steven Fackler 2019-03-11 21:16:35 -07:00
parent 7c4a323dc4
commit 914fadcec7
2 changed files with 23 additions and 9 deletions

View File

@ -19,7 +19,10 @@ jobs:
default: false default: false
image: image:
type: string type: string
default: 1.24.1 default: 1.33.0
minimal_build:
type: bool
default: false
docker: docker:
- image: rust:<< parameters.image >> - image: rust:<< parameters.image >>
environment: environment:
@ -118,6 +121,9 @@ jobs:
- /usr/local/cargo/registry/index - /usr/local/cargo/registry/index
- restore_cache: - restore_cache:
key: deps-<< parameters.image >>-<< parameters.target >>-<< parameters.library >>-<< parameters.version >>-{{ checksum "Cargo.lock" }} key: deps-<< parameters.image >>-<< parameters.target >>-<< parameters.library >>-<< parameters.version >>-{{ checksum "Cargo.lock" }}
- unless:
condition: minimal_build
steps:
- run: | - run: |
cargo run \ cargo run \
--manifest-path=systest/Cargo.toml \ --manifest-path=systest/Cargo.toml \
@ -152,7 +158,7 @@ jobs:
default: false default: false
image: image:
type: string type: string
default: 1.24.1 default: 1.33.0
macos: macos:
xcode: "9.0" xcode: "9.0"
environment: environment:
@ -197,6 +203,12 @@ openssl_101: &openssl_101
workflows: workflows:
test: test:
jobs: jobs:
- linux:
name: mimimal-version
target: x86_64-unknown-linux-musl
vendored: true
image: 1.24.1
minimal_build: true
- linux: - linux:
name: musl-vendored name: musl-vendored
target: x86_64-unknown-linux-musl target: x86_64-unknown-linux-musl

View File

@ -1,10 +1,10 @@
environment: environment:
SSL_CERT_FILE: "C:\\OpenSSL\\cacert.pem" SSL_CERT_FILE: "C:\\OpenSSL\\cacert.pem"
matrix: matrix:
# 1.1.0, 64/32 bit # 1.1.1, 64 bit
- TARGET: x86_64-pc-windows-msvc - TARGET: x86_64-pc-windows-msvc
BITS: 64 BITS: 64
OPENSSL_VERSION: 1_1_0j OPENSSL_VERSION: 1_1_1b
OPENSSL_DIR: C:\OpenSSL OPENSSL_DIR: C:\OpenSSL
# 1.0.2, 64/32 bit # 1.0.2, 64/32 bit
@ -16,6 +16,8 @@ environment:
BITS: 32 BITS: 32
OPENSSL_VERSION: 1_0_2r OPENSSL_VERSION: 1_0_2r
OPENSSL_DIR: C:\OpenSSL OPENSSL_DIR: C:\OpenSSL
# vcpkg
- TARGET: x86_64-pc-windows-msvc - TARGET: x86_64-pc-windows-msvc
VCPKG_DEFAULT_TRIPLET: x64-windows VCPKG_DEFAULT_TRIPLET: x64-windows
VCPKGRS_DYNAMIC: 1 VCPKGRS_DYNAMIC: 1