Fix workflows (#701)

* Fix workflows and deps * Move concurrency to workflow level.
tomusdrw · Aug 2, 2023 · 6e243b9 · 6e243b9
1 parent 3f6ef6b
commit 6e243b9
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 23 deletions.
diff --git a/.github/workflows/deny.yml b/.github/workflows/deny.yml
@@ -11,14 +11,13 @@ on:
       - v*
     paths-ignore:
       - 'README.md'
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 jobs:
   cargo-deny:
     runs-on:            ubuntu-latest
     steps:
-      - name:           Cancel Previous Runs
-        uses:           styfle/cancel-workflow-action@0.4.1
-        with:
-          access_token: ${{ github.token }}
       - name:           Checkout sources & submodules
         uses:           actions/checkout@master
         with:

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -9,6 +9,9 @@ on:
       - v*
     paths-ignore:
       - 'README.md'
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 jobs:
 ## Check stage
   check-fmt:
@@ -17,10 +20,6 @@ jobs:
     env:
       RUST_BACKTRACE:   full
     steps:
-      - name:           Cancel Previous Runs
-        uses:           styfle/cancel-workflow-action@0.4.1
-        with:
-          access_token: ${{ github.token }}
       - name:           Checkout sources & submodules
         uses:           actions/checkout@master
         with:

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -9,18 +9,16 @@ on:
       - v*
     paths-ignore:
       - 'README.md'
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 jobs:
-
   check-test-build:
-    name:                          Check, test and build
     runs-on:                       ubuntu-latest
+    name:                          Check, test and build
     env:
       RUST_BACKTRACE:              full
     steps:
-      - name:                      Cancel Previous Runs
-        uses:                      styfle/cancel-workflow-action@0.4.1
-        with:
-          access_token:            ${{ github.token }}
       - name:                      Checkout sources & submodules
         uses:                      actions/checkout@master
         with:
@@ -63,10 +61,6 @@ jobs:
     env:
       RUST_BACKTRACE:              full
     steps:
-      - name:                      Cancel Previous Runs
-        uses:                      styfle/cancel-workflow-action@0.4.1
-        with:
-          access_token:            ${{ github.token }}
       - name:                      Checkout sources & submodules
         uses:                      actions/checkout@master
         with:
@@ -100,10 +94,6 @@ jobs:
     env:
       RUST_BACKTRACE:              full
     steps:
-      - name:                      Cancel Previous Runs
-        uses:                      styfle/cancel-workflow-action@0.4.1
-        with:
-          access_token:            ${{ github.token }}
       - name:                      Checkout sources & submodules
         uses:                      actions/checkout@master
         with:

diff --git a/deny.toml b/deny.toml
@@ -30,7 +30,7 @@ targets = [
 # The path where the advisory database is cloned/fetched into
 db-path = "~/.cargo/advisory-db"
 # The url of the advisory database to use
-db-url = "https://github.com/rustsec/advisory-db"
+db-urls = ["https://github.com/rustsec/advisory-db"]
 # The lint level for security vulnerabilities
 vulnerability = "warn"
 # The lint level for unmaintained crates