finish cleaning up dependency bans job (#11059)
# Objective - After #10151, cache check is less useful in dependency ban job - It fails anyway because the steps are not in the right order ## Solution - Remove the added steps
This commit is contained in:
parent
7374e58e78
commit
eca7924bb4
25
.github/workflows/dependencies.yml
vendored
25
.github/workflows/dependencies.yml
vendored
@ -29,36 +29,11 @@ jobs:
|
|||||||
check-bans:
|
check-bans:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
# on main, prepare a new cargo tree output and cache it
|
|
||||||
- name: On main, prepare new cargo tree cache
|
|
||||||
if: github.ref == 'refs/heads/main'
|
|
||||||
run: cargo tree --depth 3 > cargo-tree-from-main
|
|
||||||
- name: On main, save the new cargo tree cache
|
|
||||||
if: github.ref == 'refs/heads/main'
|
|
||||||
uses: actions/cache/save@v3
|
|
||||||
with:
|
|
||||||
path: cargo-tree-from-main
|
|
||||||
key: cargo-tree-from-main
|
|
||||||
# on other branch, restore the cached cargo tree output
|
|
||||||
- name: On PR, restore cargo tree cache
|
|
||||||
uses: actions/cache/restore@v3
|
|
||||||
if: github.ref != 'refs/heads/main'
|
|
||||||
with:
|
|
||||||
path: cargo-tree-from-main
|
|
||||||
key: cargo-tree-from-main
|
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: dtolnay/rust-toolchain@stable
|
- uses: dtolnay/rust-toolchain@stable
|
||||||
# if not on main, check that the cargo tree output is unchanged
|
|
||||||
- name: Check if the cargo tree changed from main
|
|
||||||
if: github.ref != 'refs/heads/main'
|
|
||||||
continue-on-error: true
|
|
||||||
id: cargo-tree-changed
|
|
||||||
run: diff cargo-tree-from-main <(cargo tree --depth 3)
|
|
||||||
- name: Install cargo-deny
|
- name: Install cargo-deny
|
||||||
run: cargo install cargo-deny
|
run: cargo install cargo-deny
|
||||||
# if the check was not a success (either skipped because on main or failed because of a change), run the check
|
|
||||||
- name: Check for banned and duplicated dependencies
|
- name: Check for banned and duplicated dependencies
|
||||||
if: steps.cargo-tree-changed.outcome != 'success'
|
|
||||||
run: cargo deny check bans
|
run: cargo deny check bans
|
||||||
|
|
||||||
check-licenses:
|
check-licenses:
|
||||||
|
Loading…
Reference in New Issue
Block a user