Skip to content

Remove references to the BOSL license#6800

Merged
daira merged 4 commits intozcash:masterfrom
daira:change-orchard-license
Apr 15, 2024
Merged

Remove references to the BOSL license#6800
daira merged 4 commits intozcash:masterfrom
daira:change-orchard-license

Conversation

@daira
Copy link
Contributor

@daira daira commented Dec 19, 2023

closes #6801

@daira daira requested a review from str4d December 19, 2023 21:23
@daira daira force-pushed the change-orchard-license branch from 76e0c2a to cc0af9c Compare April 11, 2024 19:28
@daira daira added the safe-to-build Used to send PR to prod CI environment label Apr 11, 2024
@daira daira changed the title [WIP] Remove references to the BOSL license Remove references to the BOSL license Apr 11, 2024
@ECC-CI ECC-CI removed the safe-to-build Used to send PR to prod CI environment label Apr 11, 2024
daira added 2 commits April 15, 2024 15:45
for Ying Tong Lai, Greg Pfeil, and Steven Smith.

Signed-off-by: Daira Emma Hopwood <daira@jacaranda.org>
be used by any dependency as of the next release.

Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
@daira daira force-pushed the change-orchard-license branch from cc0af9c to 58a616d Compare April 15, 2024 14:45
@daira daira added the safe-to-build Used to send PR to prod CI environment label Apr 15, 2024
nuttycom
nuttycom previously approved these changes Apr 15, 2024
Copy link
Contributor

@nuttycom nuttycom left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 58a616d, doc-only.

Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
@daira
Copy link
Contributor Author

daira commented Apr 15, 2024

Updated to remove the exception in deny.toml as suggested by @ebfull in #6784 (review) .

@daira daira added safe-to-build Used to send PR to prod CI environment and removed safe-to-build Used to send PR to prod CI environment labels Apr 15, 2024
nuttycom
nuttycom previously approved these changes Apr 15, 2024
Copy link
Contributor

@nuttycom nuttycom left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

re-utACK 25535c4

@ECC-CI ECC-CI removed the safe-to-build Used to send PR to prod CI environment label Apr 15, 2024
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
@daira daira added the safe-to-build Used to send PR to prod CI environment label Apr 15, 2024
Copy link
Contributor

@nuttycom nuttycom left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 501c0da

Comment on lines -12 to -17
unlicensed = "deny"
version = 2
allow = [
"Apache-2.0",
"MIT",
]
copyleft = "deny"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For version 2, unlicensed = "deny" and copyleft = "deny" are the defaults; see EmbarkStudios/cargo-deny#611

@ECC-CI ECC-CI removed the safe-to-build Used to send PR to prod CI environment label Apr 15, 2024
@daira
Copy link
Contributor Author

daira commented Apr 15, 2024

The test failure for mempool_packages.py on zcash-pr/build-linux-debian-10 is a false positive.

@daira daira merged commit db47b3c into zcash:master Apr 15, 2024
@daira daira deleted the change-orchard-license branch April 15, 2024 18:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Remove references to BOSL once we have updated to depend only on orchard 0.7 (directly and indirectly)

3 participants