From f2af35fc2e108789ee6ca352eaadd20408d8c679 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= <jon.haggblad@gmail.com>
Date: Tue, 30 Jan 2024 13:56:12 +0100
Subject: [PATCH 1/6] Enable pull_request trigger on ci-cargo-deny

---
 .github/workflows/ci-cargo-deny.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci-cargo-deny.yml b/.github/workflows/ci-cargo-deny.yml
index a9a84fc271..277cb8b0f4 100644
--- a/.github/workflows/ci-cargo-deny.yml
+++ b/.github/workflows/ci-cargo-deny.yml
@@ -1,5 +1,8 @@
 name: ci-cargo-deny
-on: [workflow_dispatch]
+on:
+  workflow_dispatch:
+  pull_request:
+
 jobs:
   cargo-deny:
     runs-on: ubuntu-22.04

From be55bb61cb63a989b417e8c04230b017a929ed7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= <jon.haggblad@gmail.com>
Date: Tue, 30 Jan 2024 21:35:59 +0100
Subject: [PATCH 2/6] Add missing license annotations to ephemera and bity
 integration

---
 ephemera/Cargo.toml          | 1 +
 integrations/bity/Cargo.toml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ephemera/Cargo.toml b/ephemera/Cargo.toml
index e32fec2746..6221421aab 100644
--- a/ephemera/Cargo.toml
+++ b/ephemera/Cargo.toml
@@ -2,6 +2,7 @@
 name = "ephemera"
 version = "0.1.0"
 edition = "2021"
+license.workspace = true
 
 [[bin]]
 name = "ephemera"
diff --git a/integrations/bity/Cargo.toml b/integrations/bity/Cargo.toml
index d2b8e9ee10..16129e0c20 100644
--- a/integrations/bity/Cargo.toml
+++ b/integrations/bity/Cargo.toml
@@ -3,6 +3,7 @@ name = "nym-bity-integration"
 version = "0.1.0"
 edition = "2021"
 rust-version = "1.56"
+license.workspace = true
 
 [dependencies]
 serde = { version = "1", features = ["derive"] }

From ceeccbba079cf2a2a2b2f7a5383a6927523a3375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= <jon.haggblad@gmail.com>
Date: Tue, 30 Jan 2024 21:36:16 +0100
Subject: [PATCH 3/6] License typo

---
 nym-validator-rewarder/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nym-validator-rewarder/Cargo.toml b/nym-validator-rewarder/Cargo.toml
index 7b7396babd..0e7d2f6309 100644
--- a/nym-validator-rewarder/Cargo.toml
+++ b/nym-validator-rewarder/Cargo.toml
@@ -6,7 +6,7 @@ repository.workspace = true
 homepage.workspace = true
 documentation.workspace = true
 edition.workspace = true
-license = "GPL-3"
+license = "GPL-3.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

From 3b83c305581b7f4a41e01df79412e8357e58f6e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= <jon.haggblad@gmail.com>
Date: Tue, 30 Jan 2024 21:36:46 +0100
Subject: [PATCH 4/6] Add zlib to the list of allowed licenses

---
 deny.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/deny.toml b/deny.toml
index 63bf414358..94bd758e59 100644
--- a/deny.toml
+++ b/deny.toml
@@ -114,6 +114,7 @@ allow = [
     "CC0-1.0",
     "Unicode-DFS-2016",
     "OpenSSL",
+    "Zlib",
 ]
 # List of explicitly disallowed licenses
 # See https://spdx.org/licenses/ for list of possible licenses

From bea64b926f7f05d5855f290cda17499eadafe1ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= <jon.haggblad@gmail.com>
Date: Tue, 30 Jan 2024 21:56:34 +0100
Subject: [PATCH 5/6] Add license to cpu-cycles matching libcpucycles

---
 cpu-cycles/Cargo.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cpu-cycles/Cargo.toml b/cpu-cycles/Cargo.toml
index 59d2ed52b6..4c234b8d30 100644
--- a/cpu-cycles/Cargo.toml
+++ b/cpu-cycles/Cargo.toml
@@ -4,9 +4,10 @@ version = "0.1.0"
 edition = "2021"
 build = "build.rs"
 links = "cpucycles"
+license = "LicenseRef-PD-hp OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT"
 
 [dependencies]
 libc = "0.2.140"
 
 [build-dependencies]
-cfg-if = "1"
\ No newline at end of file
+cfg-if = "1"

From 6a3afb50b814c238f84f1d4057cb84cc30e1a291 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= <jon.haggblad@gmail.com>
Date: Wed, 31 Jan 2024 09:40:51 +0100
Subject: [PATCH 6/6] Remove continue-on-error for cargo deny check licenses

---
 .github/workflows/ci-cargo-deny.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/ci-cargo-deny.yml b/.github/workflows/ci-cargo-deny.yml
index 277cb8b0f4..ab35b5fbf5 100644
--- a/.github/workflows/ci-cargo-deny.yml
+++ b/.github/workflows/ci-cargo-deny.yml
@@ -10,10 +10,7 @@ jobs:
       matrix:
         checks:
           # - advisories
-          - licenses
-          - bans sources
-
-    continue-on-error: ${{ matrix.checks == 'licenses' }}
+          - licenses bans sources
 
     steps:
     - uses: actions/checkout@v3