Skip to content

Commit

Permalink
Merge pull request #21 from zksecurity/ci-cargo-about
Browse files Browse the repository at this point in the history
Run the CI on all branches and use cargo-about for checking licenses.
  • Loading branch information
rot256 authored Sep 28, 2024
2 parents 3df25b4 + cbb9a0f commit 6fe59d2
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 23 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/develop.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
on:
push:
branches:
- '**'
- "!master"

pull_request:
branches:
- '**'
- "!master"

jobs:
Expand All @@ -21,8 +23,8 @@ jobs:

- name: Run the license check
run: |
cargo install cargo-license
cargo license --gitlab --all-features | python3 license.py
cargo install --locked cargo-about
cargo about generate --format json --fail --all-features > /dev/null
- name: Run cargo test
run: cargo test --all-features
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ jobs:

- name: Run the license check
run: |
cargo install cargo-license
cargo license --gitlab --all-features | python3 license.py
cargo install --locked cargo-about
cargo about generate --format json --fail --all-features > /dev/null
- name: Run cargo test
run: cargo test --all-features
Expand Down
10 changes: 10 additions & 0 deletions about.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
accepted = [
"Apache-2.0",
"MIT",
"BSD-3-Clause",
"Unicode-DFS-2016"
]
ignore-transitive-dependencies = false
ignore-build-dependencies = false
ignore-dev-dependencies = false
no-clearly-defined = true
19 changes: 0 additions & 19 deletions license.py

This file was deleted.

0 comments on commit 6fe59d2

Please sign in to comment.