Commit 914fadce authored by Steven Fackler's avatar Steven Fackler
Browse files

Build against modern rust by default 

Add a single build against 1.24.1 to ensure back compat
parent 7c4a323d

.circleci/config.yml

+19 −7
Original line number Diff line number Diff line
@@ -19,7 +19,10 @@ jobs: 
        default: false

      image:

        type: string

        default: 1.24.1

        default: 1.33.0

      minimal_build:

        type: bool

        default: false

    docker:

      - image: rust:<< parameters.image >>

    environment:
@@ -118,6 +121,9 @@ jobs: 
            - /usr/local/cargo/registry/index

      - restore_cache:

          key: deps-<< parameters.image >>-<< parameters.target >>-<< parameters.library >>-<< parameters.version >>-{{ checksum "Cargo.lock" }}

      - unless:

          condition: minimal_build

          steps:

            - run: |

                cargo run \

                  --manifest-path=systest/Cargo.toml \
@@ -152,7 +158,7 @@ jobs: 
        default: false

      image:

        type: string

        default: 1.24.1

        default: 1.33.0

    macos:

      xcode: "9.0"

    environment:
@@ -197,6 +203,12 @@ openssl_101: &openssl_101 
workflows:

  test:

    jobs:

      - linux:

          name: mimimal-version

          target: x86_64-unknown-linux-musl

          vendored: true

          image: 1.24.1

          minimal_build: true

      - linux:

          name: musl-vendored

          target: x86_64-unknown-linux-musl

appveyor.yml

+4 −2
Original line number Diff line number Diff line 
environment:

  SSL_CERT_FILE: "C:\\OpenSSL\\cacert.pem"

  matrix:

    # 1.1.0, 64/32 bit

    # 1.1.1, 64 bit

    - TARGET: x86_64-pc-windows-msvc

      BITS: 64

      OPENSSL_VERSION: 1_1_0j

      OPENSSL_VERSION: 1_1_1b

      OPENSSL_DIR: C:\OpenSSL



    # 1.0.2, 64/32 bit
@@ -16,6 +16,8 @@ environment: 
      BITS: 32

      OPENSSL_VERSION: 1_0_2r

      OPENSSL_DIR: C:\OpenSSL



    # vcpkg

    - TARGET: x86_64-pc-windows-msvc

      VCPKG_DEFAULT_TRIPLET: x64-windows

      VCPKGRS_DYNAMIC: 1