Skip to content

Commit

Permalink
actions: generalize the wycheproof fetch action (#9848)
Browse files Browse the repository at this point in the history
* actions: add a fetch-limbo action

Not hooked up to anything yet.

Signed-off-by: William Woodruff <[email protected]>

* actions: combined vector fetching

Signed-off-by: William Woodruff <[email protected]>

* dependabot: change ref

Signed-off-by: William Woodruff <[email protected]>

---------

Signed-off-by: William Woodruff <[email protected]>
  • Loading branch information
woodruffw authored Nov 10, 2023
1 parent f1faacc commit b7096f7
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 22 deletions.
18 changes: 18 additions & 0 deletions .github/actions/fetch-vectors/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Clone test vectors
description: Clones the wycheproof and x509-limbo repositories

runs:
using: "composite"

steps:
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
with:
repository: "google/wycheproof"
path: "wycheproof"
ref: "master"

- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
with:
repository: "trailofbits/x509-limbo"
path: "x509-limbo"
ref: "main"
12 changes: 0 additions & 12 deletions .github/actions/wycheproof/action.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ updates:
timezone: "America/New_York"
open-pull-requests-limit: 1024
- package-ecosystem: "github-actions"
directory: "/.github/actions/wycheproof/"
directory: "/.github/actions/fetch-vectors/"
schedule:
interval: "daily"
time: "06:00"
Expand Down Expand Up @@ -51,7 +51,7 @@ updates:
# Also update indirect dependencies
- dependency-type: all
open-pull-requests-limit: 1024

- package-ecosystem: pip
directory: "/.github/requirements/"
schedule:
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ jobs:

- run: rustup component add llvm-tools-preview
if: matrix.PYTHON.NOXSESSION != 'flake' && matrix.PYTHON.NOXSESSION != 'docs'
- name: Clone wycheproof
- name: Clone test vectors
timeout-minutes: 2
uses: ./.github/actions/wycheproof
uses: ./.github/actions/fetch-vectors
if: matrix.PYTHON.NOXSESSION != 'flake' && matrix.PYTHON.NOXSESSION != 'docs' && matrix.PYTHON.NOXSESSION != 'rust'
- name: Compute config hash and set config vars
run: |
Expand Down Expand Up @@ -188,9 +188,9 @@ jobs:
timeout-minutes: 2
with:
key: ${{ matrix.IMAGE.IMAGE }}
- name: Clone wycheproof
- name: Clone test vectors
timeout-minutes: 2
uses: ./.github/actions/wycheproof
uses: ./.github/actions/fetch-vectors
# When run in a docker container the home directory doesn't have the same owner as the
# apparent user so pip refuses to create a cache dir
- name: create pip cache dir
Expand Down Expand Up @@ -251,9 +251,9 @@ jobs:

- run: python -m pip install -c ci-constraints-requirements.txt 'nox' 'tomli; python_version < "3.11"'

- name: Clone wycheproof
- name: Clone test vectors
timeout-minutes: 2
uses: ./.github/actions/wycheproof
uses: ./.github/actions/fetch-vectors

- uses: dawidd6/action-download-artifact@268677152d06ba59fcec7a7f0b5d961b6ccd7e1e # v2.28.0
with:
Expand Down Expand Up @@ -328,9 +328,9 @@ jobs:
echo "OPENSSL_DIR=C:/openssl-${{ matrix.WINDOWS.WINDOWS }}" >> $GITHUB_ENV
shell: bash

- name: Clone wycheproof
- name: Clone test vectors
timeout-minutes: 2
uses: ./.github/actions/wycheproof
uses: ./.github/actions/fetch-vectors

- name: Build nox environment
run: nox -v --install-only
Expand Down

0 comments on commit b7096f7

Please sign in to comment.