From b34f3e8d299dd791d76a05d9975ecd0e864bd408 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Mon, 25 May 2020 17:09:10 -0700 Subject: [PATCH 1/3] asdf --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5f611859..2232a92e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,6 +40,8 @@ jobs: with: path: ~/.cargo/registry/cache key: registry-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }} + - name: Fetch dependencies + run: cargo fetch - name: Cache target directory uses: actions/cache@v1 with: From 8909396836014945a1063fa23acb1d8daf27a51c Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Mon, 25 May 2020 17:53:53 -0700 Subject: [PATCH 2/3] Move min-version to github actions --- .circleci/config.yml | 6 ------ .github/workflows/ci.yml | 43 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5bf3cf0b..6a6d3749 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -226,12 +226,6 @@ openssl_101: &openssl_101 workflows: test: jobs: - - linux: - name: mimimal-version - target: x86_64-unknown-linux-musl - vendored: true - image: 1.31.0 - minimal_build: true - linux: name: musl-vendored target: x86_64-unknown-linux-musl diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2232a92e..4d20b226 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,6 +33,13 @@ jobs: - name: Get rust version id: rust-version run: echo "::set-output name=version::$(rustc --version)" + - name: Cache cargo index + uses: actions/cache@v1 + with: + path: ~/.cargo/registry/index + key: index-${{ runner.os }}-${{ github.run_number }} + restore-keys: + - index-${{ runner.os }}- - name: Create lockfile run: cargo generate-lockfile - name: Cache cargo registry @@ -47,5 +54,39 @@ jobs: with: path: target key: clippy-target-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }} - - name: Check clippy + - name: Run clippy clippy run: cargo clippy --all --all-targets + + min-version: + name: min-version + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Install Rust + run: rustup update 1.31.0 && rustup default 1.31.0 + - name: Get rust version + id: rust-version + run: echo "::set-output name=version::$(rustc --version)" + - name: Cache cargo index + uses: actions/cache@v1 + with: + path: ~/.cargo/registry/index + key: index-${{ runner.os }}-${{ github.run_number }} + restore-keys: + - index-${{ runner.os }}- + - name: Create lockfile + run: cargo generate-lockfile + - name: Cache cargo registry + uses: actions/cache@v1 + with: + path: ~/.cargo/registry/cache + key: registry-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }} + - name: Fetch dependencies + run: cargo fetch + - name: Cache target directory + uses: actions/cache@v1 + with: + path: target + key: clippy-target-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }} + - name: Check openssl + run: cargo check -p openssl From 63928bdaaf027050eee98250e539d455c001559c Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Mon, 25 May 2020 17:56:04 -0700 Subject: [PATCH 3/3] fix syntax --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4d20b226..0e332bdd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,8 +38,8 @@ jobs: with: path: ~/.cargo/registry/index key: index-${{ runner.os }}-${{ github.run_number }} - restore-keys: - - index-${{ runner.os }}- + restore-keys: | + index-${{ runner.os }}- - name: Create lockfile run: cargo generate-lockfile - name: Cache cargo registry @@ -72,8 +72,8 @@ jobs: with: path: ~/.cargo/registry/index key: index-${{ runner.os }}-${{ github.run_number }} - restore-keys: - - index-${{ runner.os }}- + restore-keys: | + index-${{ runner.os }}- - name: Create lockfile run: cargo generate-lockfile - name: Cache cargo registry