mirror of
https://github.com/saymrwulf/cryptography.git
synced 2026-05-14 20:37:55 +00:00
make our rust/pip cache a composite action (#8287)
* make our rust/pip cache a composite action * fixes
This commit is contained in:
Paul Kehrer
GitHub
parent
030381a9df
commit
2bf2f2c030
2 changed files with 66 additions and 69 deletions
43
.github/actions/cache/action.yml
vendored
Normal file
43
.github/actions/cache/action.yml
vendored
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
name: Cache rust and pip
|
||||
description: Caches rust and pip data to speed builds
|
||||
inputs:
|
||||
additional-paths:
|
||||
description: 'Additional paths to add to the cache'
|
||||
required: false
|
||||
default: ''
|
||||
key:
|
||||
description: 'cache key'
|
||||
required: true
|
||||
outputs:
|
||||
cache-hit:
|
||||
description: 'Was the cache hit?'
|
||||
value: ${{ steps.cache.outputs.cache-hit }}
|
||||
|
||||
|
||||
runs:
|
||||
using: "composite"
|
||||
|
||||
steps:
|
||||
- name: Get pip cache dir
|
||||
id: pip-cache
|
||||
run: |
|
||||
# Determine the path to our Python. It's in venv for our containers
|
||||
# but just standard $PATH for setup-python pythons.
|
||||
if [[ -f "/venv/bin/python" ]]; then
|
||||
echo "dir=$(/venv/bin/python -m pip cache dir)" >> $GITHUB_OUTPUT
|
||||
elif which python >/dev/null; then
|
||||
echo "dir=$(python -m pip cache dir)" >> $GITHUB_OUTPUT
|
||||
fi
|
||||
shell: bash
|
||||
- uses: actions/cache@v3.2.5
|
||||
id: cache
|
||||
with:
|
||||
path: |
|
||||
${{ steps.pip-cache.outputs.dir }}
|
||||
~/.cargo/registry/index/
|
||||
~/.cargo/registry/cache/
|
||||
~/.cargo/registry/src/
|
||||
~/.cargo/git/db/
|
||||
src/rust/target/
|
||||
${{ inputs.additional-paths }}
|
||||
key: ${{ inputs.key }}
|
||||
92
.github/workflows/ci.yml
vendored
92
.github/workflows/ci.yml
vendored
|
|
@ -59,18 +59,11 @@ jobs:
|
|||
uses: actions/setup-python@v4.5.0
|
||||
with:
|
||||
python-version: ${{ matrix.PYTHON.VERSION }}
|
||||
- uses: actions/cache@v3.2.5
|
||||
timeout-minutes: 5
|
||||
- name: Cache rust and pip
|
||||
uses: ./.github/actions/cache
|
||||
timeout-minutes: 2
|
||||
with:
|
||||
path: |
|
||||
~/.cache/pip/wheels
|
||||
~/.cargo/registry/index/
|
||||
~/.cargo/registry/cache/
|
||||
~/.cargo/registry/src/
|
||||
~/.cargo/git/db/
|
||||
src/rust/target/
|
||||
key: ${{ runner.os }}-${{ matrix.PYTHON.VERSION }}-${{ steps.setup-python.outputs.python-version }}-cargo-3-${{ hashFiles('**/Cargo.lock') }}
|
||||
|
||||
- name: Clone wycheproof
|
||||
timeout-minutes: 2
|
||||
uses: ./.github/actions/wycheproof
|
||||
|
|
@ -171,18 +164,11 @@ jobs:
|
|||
git config --global --add safe.directory $(pwd) # needed for the mtime fix since git doesn't think it owns the files due to being in containers
|
||||
- name: set mtimes for rust dirs
|
||||
uses: ./.github/actions/mtime-fix
|
||||
- uses: actions/cache@v3.2.5
|
||||
timeout-minutes: 5
|
||||
- name: Cache rust and pip
|
||||
uses: ./.github/actions/cache
|
||||
timeout-minutes: 2
|
||||
with:
|
||||
path: |
|
||||
~/.cache/pip/wheels
|
||||
~/.cargo/registry/index/
|
||||
~/.cargo/registry/cache/
|
||||
~/.cargo/registry/src/
|
||||
~/.cargo/git/db/
|
||||
src/rust/target/
|
||||
key: ${{ runner.os }}-${{ matrix.IMAGE.IMAGE }}-${{ runner.arch }}-cargo-3-${{ hashFiles('**/Cargo.lock') }}
|
||||
|
||||
- name: Clone wycheproof
|
||||
timeout-minutes: 2
|
||||
uses: ./.github/actions/wycheproof
|
||||
|
|
@ -237,18 +223,11 @@ jobs:
|
|||
fetch-depth: 0
|
||||
- name: set mtimes for rust dirs
|
||||
uses: ./.github/actions/mtime-fix
|
||||
- uses: actions/cache@v3.2.5
|
||||
timeout-minutes: 5
|
||||
- name: Cache rust and pip
|
||||
uses: ./.github/actions/cache
|
||||
timeout-minutes: 2
|
||||
with:
|
||||
path: |
|
||||
~/.cache/pip/wheels
|
||||
~/.cargo/registry/index/
|
||||
~/.cargo/registry/cache/
|
||||
~/.cargo/registry/src/
|
||||
~/.cargo/git/db/
|
||||
src/rust/target/
|
||||
key: ${{ runner.os }}-cargo-3-${{ hashFiles('**/Cargo.lock') }}-${{ matrix.RUST }}
|
||||
|
||||
- name: Setup python
|
||||
uses: actions/setup-python@v4.5.0
|
||||
with:
|
||||
|
|
@ -297,19 +276,14 @@ jobs:
|
|||
with:
|
||||
toolchain: ${{ matrix.RUST }}
|
||||
components: llvm-tools-preview
|
||||
- uses: actions/cache@v3.2.5
|
||||
- name: Cache rust and pip
|
||||
id: cargo-cache
|
||||
timeout-minutes: 5
|
||||
uses: ./.github/actions/cache
|
||||
timeout-minutes: 2
|
||||
with:
|
||||
path: |
|
||||
~/.cache/pip/wheels
|
||||
~/.cargo/bin/
|
||||
~/.cargo/registry/cache/
|
||||
~/.cargo/registry/src/
|
||||
~/.cargo/git/db/
|
||||
src/rust/target/
|
||||
key: ${{ runner.os }}-cargo-3-${{ hashFiles('**/Cargo.lock') }}-rust-${{ steps.rust-toolchain.outputs.cachekey }}-coverage
|
||||
|
||||
additional-paths: |
|
||||
~/.cargo/bin/
|
||||
- name: Setup python
|
||||
uses: actions/setup-python@v4.5.0
|
||||
with:
|
||||
|
|
@ -391,16 +365,10 @@ jobs:
|
|||
fetch-depth: 0
|
||||
- name: set mtimes for rust dirs
|
||||
uses: ./.github/actions/mtime-fix
|
||||
- uses: actions/cache@v3.2.5
|
||||
timeout-minutes: 5
|
||||
- name: Cache rust and pip
|
||||
uses: ./.github/actions/cache
|
||||
timeout-minutes: 2
|
||||
with:
|
||||
path: |
|
||||
~/Library/Caches/pip/wheels
|
||||
~/.cargo/registry/index/
|
||||
~/.cargo/registry/cache/
|
||||
~/.cargo/registry/src/
|
||||
~/.cargo/git/db/
|
||||
src/rust/target/
|
||||
key: ${{ runner.os }}-${{ runner.arch }}-${{ matrix.PYTHON.VERSION }}-cargo-3-${{ hashFiles('**/Cargo.lock') }}
|
||||
|
||||
- name: Setup python
|
||||
|
|
@ -465,18 +433,11 @@ jobs:
|
|||
with:
|
||||
python-version: ${{ matrix.PYTHON.VERSION }}
|
||||
architecture: ${{ matrix.WINDOWS.ARCH }}
|
||||
- uses: actions/cache@v3.2.5
|
||||
timeout-minutes: 5
|
||||
- name: Cache rust and pip
|
||||
uses: ./.github/actions/cache
|
||||
timeout-minutes: 2
|
||||
with:
|
||||
path: |
|
||||
~/AppData/Local/pip/Cache/wheels
|
||||
~/.cargo/registry/index/
|
||||
~/.cargo/registry/cache/
|
||||
~/.cargo/registry/src/
|
||||
~/.cargo/git/db/
|
||||
src/rust/target/
|
||||
key: ${{ runner.os }}-${{ matrix.WINDOWS.ARCH }}-${{ steps.setup-python.outputs.python-version }}-cargo-3-${{ hashFiles('**/Cargo.lock') }}
|
||||
|
||||
- run: python -m pip install -c ci-constraints-requirements.txt "tox>3" requests coverage[toml]
|
||||
- name: Download OpenSSL
|
||||
run: |
|
||||
|
|
@ -532,18 +493,11 @@ jobs:
|
|||
fetch-depth: 0
|
||||
- name: set mtimes for rust dirs
|
||||
uses: ./.github/actions/mtime-fix
|
||||
- uses: actions/cache@v3.2.5
|
||||
timeout-minutes: 5
|
||||
- name: Cache rust and pip
|
||||
uses: ./.github/actions/cache
|
||||
timeout-minutes: 2
|
||||
with:
|
||||
path: |
|
||||
~/.cache/pip/wheels
|
||||
~/.cargo/registry/index/
|
||||
~/.cargo/registry/cache/
|
||||
~/.cargo/registry/src/
|
||||
~/.cargo/git/db/
|
||||
src/rust/target/
|
||||
key: ${{ runner.os }}-cargo-3-${{ hashFiles('**/Cargo.lock') }}
|
||||
|
||||
- name: Setup python
|
||||
uses: actions/setup-python@v4.5.0
|
||||
with:
|
||||
|
|
|
|||
Loading…
Reference in a new issue