Commit 7c4a323d authored by Steven Fackler's avatar Steven Fackler
Browse files

Parameterize rust version in circle

parent 487963d1
Loading
Loading
Loading
Loading
+62 −56
Original line number Diff line number Diff line
@@ -17,8 +17,11 @@ jobs:
      no_run:
        type: boolean
        default: false
      image:
        type: string
        default: 1.24.1
    docker:
      - image: rust:1.24.1
      - image: rust:<< parameters.image >>
    environment:
      RUST_BACKTRACE: 1
      OPENSSL_DIR: /opt/openssl
@@ -50,6 +53,9 @@ jobs:
          esac

          rustup target add << parameters.target >>
      - unless:
          condition: << parameters.vendored >>
          steps:
            - restore_cache:
                key: openssl-<< parameters.target >>-<< parameters.library >>-<< parameters.version >>
            - run: |
@@ -64,9 +70,6 @@ jobs:
                "openssl")
                  URL="https://openssl.org/source/openssl-<< parameters.version >>.tar.gz"
                  ;;
          "")
            exit 0
            ;;
                esac

                case "<< parameters.target >>" in
@@ -114,7 +117,7 @@ jobs:
          paths:
            - /usr/local/cargo/registry/index
      - restore_cache:
          key: deps-1.24.1-<< parameters.target >>-<< parameters.library >>-<< parameters.version >>-{{ checksum "Cargo.lock" }}
          key: deps-<< parameters.image >>-<< parameters.target >>-<< parameters.library >>-<< parameters.version >>-{{ checksum "Cargo.lock" }}
      - run: |
          cargo run \
            --manifest-path=systest/Cargo.toml \
@@ -129,7 +132,7 @@ jobs:
            --target << parameters.target >> \
            <<# parameters.no_run >>--no-run<</ parameters.no_run >>
      - save_cache:
          key: deps-1.24.1-<< parameters.target >>-<< parameters.library >>-<< parameters.version >>-{{ checksum "Cargo.lock" }}
          key: deps-<< parameters.image >>-<< parameters.target >>-<< parameters.library >>-<< parameters.version >>-{{ checksum "Cargo.lock" }}
          paths:
            - /usr/local/cargo/registry/cache
            - target
@@ -147,6 +150,9 @@ jobs:
      vendored:
        type: boolean
        default: false
      image:
        type: string
        default: 1.24.1
    macos:
      xcode: "9.0"
    environment:
@@ -155,11 +161,11 @@ jobs:
      - checkout
      - run: sudo mkdir /opt
      - run: sudo chown -R $USER /usr/local/ /opt
      - run: curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.24.1
      - run: curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain << parameters.image >>
      - run: sudo ln -s ~/.cargo/bin/* /usr/local/bin
      - run: cargo generate-lockfile
      - restore_cache:
          key: deps-1.24.1-macos-<< parameters.vendored >>-{{ checksum "Cargo.lock" }}
          key: deps-<< parameters.image >>-macos-<< parameters.vendored >>-{{ checksum "Cargo.lock" }}
      - run: |
          cargo run \
            --manifest-path=systest/Cargo.toml \
@@ -170,7 +176,7 @@ jobs:
            --manifest-path=openssl/Cargo.toml \
            <<# parameters.vendored >> --features vendored <</ parameters.vendored >>
      - save_cache:
          key: deps-1.24.1-macos-<< parameters.vendored >>-{{ checksum "Cargo.lock" }}
          key: deps-<< parameters.image >>-macos-<< parameters.vendored >>-{{ checksum "Cargo.lock" }}
          paths:
            - ~/.cargo/registry/cache
            - target