From 7cd01bca0c29559a1b3461fc6ebedf200410cdca Mon Sep 17 00:00:00 2001 From: Jake Shadle Date: Tue, 13 Feb 2024 11:38:06 +0100 Subject: [PATCH 1/5] Add actual testing of the changes in a PR --- .github/workflows/test.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 057d18a..d7ea920 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,3 +15,11 @@ jobs: - name: Run check run: docker run -v ${PWD}/test:/test test-cargo-deny 1.70.0 "" --manifest-path test/Cargo.toml --all-features check + + # Ensures the action in the PR still works + test: + runs-on: ubunut-22.04 + if: github.event_name == 'pull_request' + steps: + - uses: actions/checkout@v4 + - uses: EmbarkStudios/cargo-deny-action@v1 From e49261b1d461389cb1332ca2d5943b742d286ee8 Mon Sep 17 00:00:00 2001 From: Jake Shadle Date: Tue, 13 Feb 2024 11:40:03 +0100 Subject: [PATCH 2/5] Derp --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d7ea920..9fde0f3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,7 +18,7 @@ jobs: # Ensures the action in the PR still works test: - runs-on: ubunut-22.04 + runs-on: ubuntu-22.04 if: github.event_name == 'pull_request' steps: - uses: actions/checkout@v4 From a6e54e8d095438bbf7c304c730ab5d2451a9a44e Mon Sep 17 00:00:00 2001 From: Jake Shadle Date: Tue, 13 Feb 2024 11:41:16 +0100 Subject: [PATCH 3/5] mmk --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9fde0f3..bc40788 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,3 +23,5 @@ jobs: steps: - uses: actions/checkout@v4 - uses: EmbarkStudios/cargo-deny-action@v1 + with: + manifest-path: test/Cargo.toml \ No newline at end of file From 33fd0efd3318b605bec1899bc71539af9845e054 Mon Sep 17 00:00:00 2001 From: Jake Shadle Date: Tue, 13 Feb 2024 11:43:33 +0100 Subject: [PATCH 4/5] ok... --- .cargo/deny.toml | 2 ++ .github/workflows/test.yml | 6 +++--- Cargo.toml | 6 ++++++ action.yml | 2 +- src/main.rs | 1 + 5 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 .cargo/deny.toml create mode 100644 Cargo.toml create mode 100644 src/main.rs diff --git a/.cargo/deny.toml b/.cargo/deny.toml new file mode 100644 index 0000000..2e64ced --- /dev/null +++ b/.cargo/deny.toml @@ -0,0 +1,2 @@ +[bans] +deny = [{ name = "openssl" }] diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bc40788..9bc9952 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,6 +22,6 @@ jobs: if: github.event_name == 'pull_request' steps: - uses: actions/checkout@v4 - - uses: EmbarkStudios/cargo-deny-action@v1 - with: - manifest-path: test/Cargo.toml \ No newline at end of file + - uses: EmbarkStudios/cargo-deny-action@fix + # with: + # manifest-path: test/Cargo.toml \ No newline at end of file diff --git a/Cargo.toml b/Cargo.toml new file mode 100644 index 0000000..1dcfb7d --- /dev/null +++ b/Cargo.toml @@ -0,0 +1,6 @@ +[package] +name = "root" +version = "0.1.0" + +[dependencies] +openssl = "0.10" diff --git a/action.yml b/action.yml index f06973e..e6a902f 100644 --- a/action.yml +++ b/action.yml @@ -22,7 +22,7 @@ inputs: manifest-path: description: "Repo root relative path to the Cargo manifest to check" required: false - default: "Cargo.toml" + default: "./Cargo.toml" log-level: description: "The log level for cargo-deny" required: false diff --git a/src/main.rs b/src/main.rs new file mode 100644 index 0000000..f328e4d --- /dev/null +++ b/src/main.rs @@ -0,0 +1 @@ +fn main() {} From 4d9c0356f364113b6bc34bfebec529dc9d0bffcf Mon Sep 17 00:00:00 2001 From: Jake Shadle Date: Tue, 13 Feb 2024 11:55:28 +0100 Subject: [PATCH 5/5] Add note --- .cargo/deny.toml | 4 ++-- .github/workflows/test.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.cargo/deny.toml b/.cargo/deny.toml index 2e64ced..95a34ed 100644 --- a/.cargo/deny.toml +++ b/.cargo/deny.toml @@ -1,2 +1,2 @@ -[bans] -deny = [{ name = "openssl" }] +[licenses] +allow = ["Unicode-DFS-2016", "MIT", "Apache-2.0"] diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9bc9952..062bab6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,6 +22,6 @@ jobs: if: github.event_name == 'pull_request' steps: - uses: actions/checkout@v4 - - uses: EmbarkStudios/cargo-deny-action@fix + - uses: EmbarkStudios/cargo-deny-action@fix # change branch name to PR branch if you are changing it # with: # manifest-path: test/Cargo.toml \ No newline at end of file