Skip to content

Conversation

@ltratt
Copy link
Member

@ltratt ltratt commented Nov 24, 2024

It also turns out that our previous pull requests hadn't passed through CI properly due to an incorrect GitHub setting (mea culpa!). This PR does do something useful, and will also make sure we pass CI before a release!

@ratmice ratmice added this pull request to the merge queue Nov 24, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Nov 24, 2024
@ratmice
Copy link
Collaborator

ratmice commented Nov 24, 2024

I think the issue is cargo deny check, I had to remove unlicensed = deny (now the default according to this, and change the unicode license to Unicode-3.0,
keeping Unicode-DFS-2016 produced a warning

diff --git a/deny.toml b/deny.toml
index 31719a9..5f47cf2 100644
--- a/deny.toml
+++ b/deny.toml
@@ -1,8 +1,7 @@
 [licenses]
-unlicensed = "deny"
 confidence-threshold = 1.0
 allow = [
     "Apache-2.0",
     "MIT",
-    "Unicode-DFS-2016"
+    "Unicode-3.0",
 ]

We need to remove the deprecated `unlicensed` field and reflect a change
in `unicode-ident`'s license.
@ltratt
Copy link
Member Author

ltratt commented Nov 24, 2024

Yep, I accidentally recreated the same changes you did (I should have checked first!). Ready for merging (I don't think that second commit should be squashed).

@ratmice ratmice added this pull request to the merge queue Nov 24, 2024
Merged via the queue into softdevteam:master with commit 524b85b Nov 24, 2024
2 checks passed
@ltratt ltratt deleted the remove_travis_yml branch March 18, 2025 13:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants