diff --git a/.github/workflows/assign-ids.yml b/.github/workflows/assign-ids.yml index b5427101..425aa10c 100644 --- a/.github/workflows/assign-ids.yml +++ b/.github/workflows/assign-ids.yml @@ -12,17 +12,15 @@ jobs: - uses: actions/checkout@v4 - name: Cache cargo bin + id: admin-cache uses: actions/cache@v4 with: path: ~/.cargo/bin - key: rustsec-admin-v0.8.8 + key: rustsec-admin-b7c69254bda9b8f4c94bc5eaef47e5bb3a97d8cd - name: Install rustsec-admin - run: | - VERSION="0.8.8" - if ! ( rustsec-admin --version | grep -q "$VERSION" ); then - cargo install rustsec-admin --force --vers "$VERSION" - fi + if: steps.admin-cache.outputs.cache-hit != 'true' + run: cargo install --git https://github.com/rustsec/rustsec rustsec-admin --rev b7c69254bda9b8f4c94bc5eaef47e5bb3a97d8cd - name: Assign IDs id: assign diff --git a/.github/workflows/export-osv.yml b/.github/workflows/export-osv.yml index 9dd5cec3..5ebd9e3e 100644 --- a/.github/workflows/export-osv.yml +++ b/.github/workflows/export-osv.yml @@ -11,15 +11,18 @@ jobs: - uses: actions/checkout@v4 with: ref: osv + - uses: actions/cache@v4 + id: admin-cache with: path: ~/.cargo/bin - key: rustsec-admin-v0.8.8 + key: rustsec-admin-b7c69254bda9b8f4c94bc5eaef47e5bb3a97d8cd + + - name: Install rustsec-admin + if: steps.admin-cache.outputs.cache-hit != 'true' + run: cargo install --git https://github.com/rustsec/rustsec rustsec-admin --rev b7c69254bda9b8f4c94bc5eaef47e5bb3a97d8cd + - run: | - VERSION="0.8.8" - if ! ( rustsec-admin --version | grep -q "$VERSION" ); then - cargo install rustsec-admin --force --vers "$VERSION" - fi mkdir -p crates rustsec-admin osv crates # FIXME: hack to avoid committing advisories without an ID diff --git a/.github/workflows/publish-web.yml b/.github/workflows/publish-web.yml index 4e782572..d09d2ef8 100644 --- a/.github/workflows/publish-web.yml +++ b/.github/workflows/publish-web.yml @@ -11,15 +11,18 @@ jobs: - uses: actions/checkout@v4 with: ref: gh-pages + - uses: actions/cache@v4 + id: admin-cache with: path: ~/.cargo/bin - key: rustsec-admin-v0.8.8 + key: rustsec-admin-b7c69254bda9b8f4c94bc5eaef47e5bb3a97d8cd + + - name: Install rustsec-admin + if: steps.admin-cache.outputs.cache-hit != 'true' + run: cargo install --git https://github.com/rustsec/rustsec rustsec-admin --rev b7c69254bda9b8f4c94bc5eaef47e5bb3a97d8cd + - run: | - VERSION="0.8.8" - if ! ( rustsec-admin --version | grep -q "$VERSION" ); then - cargo install rustsec-admin --force --vers "$VERSION" - fi rustsec-admin web . git config user.name github-actions git config user.email github-actions@github.com diff --git a/.github/workflows/sync-ids.yml b/.github/workflows/sync-ids.yml index 1c414218..1fde7079 100644 --- a/.github/workflows/sync-ids.yml +++ b/.github/workflows/sync-ids.yml @@ -14,17 +14,15 @@ jobs: - uses: actions/checkout@v4 - name: Cache cargo bin + id: admin-cache uses: actions/cache@v4 with: path: ~/.cargo/bin - key: rustsec-admin-v0.8.9 + key: rustsec-admin-b7c69254bda9b8f4c94bc5eaef47e5bb3a97d8cd - name: Install rustsec-admin - run: | - VERSION="0.8.9" - if ! ( rustsec-admin --version | grep -q "$VERSION" ); then - cargo install rustsec-admin --force --vers "$VERSION" - fi + if: steps.admin-cache.outputs.cache-hit != 'true' + run: cargo install --git https://github.com/rustsec/rustsec rustsec-admin --rev b7c69254bda9b8f4c94bc5eaef47e5bb3a97d8cd - name: Synchronize IDs id: sync_ids diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 3a058a37..44ce76fe 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -13,17 +13,15 @@ jobs: - uses: actions/checkout@v4 - name: Cache cargo bin + id: admin-cache uses: actions/cache@v4 with: path: ~/.cargo/bin - key: rustsec-admin-v0.8.8 + key: rustsec-admin-b7c69254bda9b8f4c94bc5eaef47e5bb3a97d8cd - name: Install rustsec-admin - run: | - VERSION="0.8.8" - if ! ( rustsec-admin --version | grep -q "$VERSION" ); then - cargo install rustsec-admin --force --vers "$VERSION" - fi + if: steps.admin-cache.outputs.cache-hit != 'true' + run: cargo install --git https://github.com/rustsec/rustsec rustsec-admin --rev b7c69254bda9b8f4c94bc5eaef47e5bb3a97d8cd - name: Lint advisories run: rustsec-admin lint --skip-namecheck rustdecimal,vec-const