From d6377e0188e004cb9b9cbf572ae8ebf660db1943 Mon Sep 17 00:00:00 2001
From: "Sergey \"Shnatsel\" Davidoff" <shnatsel@gmail.com>
Date: Fri, 24 Mar 2023 14:38:59 +0000
Subject: [PATCH] Fix CI always using an outdated version of rustsec-admin
 (#1660)

* Fix CI always using an outdated version of rustsec-admin

* Bump the cache key in tandem with version bump

* Dummy commit to make sure CI works on subsequent runs

* Check that the required version is installed, reinstall if not

* Fix shell syntax

* Dummy commit to make sure CI works on subsequent runs
---
 .github/workflows/assign-ids.yml  | 5 +++--
 .github/workflows/export-osv.yml  | 5 +++--
 .github/workflows/publish-web.yml | 5 +++--
 .github/workflows/validate.yml    | 5 +++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/assign-ids.yml b/.github/workflows/assign-ids.yml
index 2abbfae..df026b8 100644
--- a/.github/workflows/assign-ids.yml
+++ b/.github/workflows/assign-ids.yml
@@ -19,8 +19,9 @@ jobs:
 
     - name: Install rustsec-admin
       run: |
-        if [ ! -f $HOME/.cargo/bin/rustsec-admin ]; then
-            cargo install rustsec-admin --vers 0.8.5
+        VERSION="0.8.5"
+        if ! ( rustsec-admin --version | grep -q "$VERSION" ); then
+          cargo install rustsec-admin --force --vers "$VERSION"
         fi
 
     - name: Assign IDs
diff --git a/.github/workflows/export-osv.yml b/.github/workflows/export-osv.yml
index 82d473a..8651640 100644
--- a/.github/workflows/export-osv.yml
+++ b/.github/workflows/export-osv.yml
@@ -16,8 +16,9 @@ jobs:
           path: ~/.cargo/bin
           key: rustsec-admin-v0.8.5
       - run: |
-          if [ ! -f $HOME/.cargo/bin/rustsec-admin ]; then
-           cargo install rustsec-admin --vers 0.8.5
+          VERSION="0.8.5"
+          if ! ( rustsec-admin --version | grep -q "$VERSION" ); then
+            cargo install rustsec-admin --force --vers "$VERSION"
           fi
           mkdir -p crates
           rustsec-admin osv crates
diff --git a/.github/workflows/publish-web.yml b/.github/workflows/publish-web.yml
index 3d93fd2..0c07cbb 100644
--- a/.github/workflows/publish-web.yml
+++ b/.github/workflows/publish-web.yml
@@ -16,8 +16,9 @@ jobs:
           path: ~/.cargo/bin
           key: rustsec-admin-v0.8.5
       - run: |
-          if [ ! -f $HOME/.cargo/bin/rustsec-admin ]; then
-           cargo install rustsec-admin --vers 0.8.5
+          VERSION="0.8.5"
+          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
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 558d9a4..14eec8f 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -20,8 +20,9 @@ jobs:
 
     - name: Install rustsec-admin
       run: |
-        if [ ! -f $HOME/.cargo/bin/rustsec-admin ]; then
-            cargo install rustsec-admin --vers 0.8.5
+        VERSION="0.8.5"
+        if ! ( rustsec-admin --version | grep -q "$VERSION" ); then
+          cargo install rustsec-admin --force --vers "$VERSION"
         fi
 
     - name: Lint advisories