Skip to content

Remove notices about the BOSL license#1071

Merged
daira merged 1 commit intozcash:mainfrom
daira:change-orchard-license
Jan 18, 2024
Merged

Remove notices about the BOSL license#1071
daira merged 1 commit intozcash:mainfrom
daira:change-orchard-license

Conversation

@daira
Copy link
Copy Markdown
Contributor

@daira daira commented Dec 19, 2023

fixes #1072

@daira daira requested a review from str4d December 19, 2023 21:01
@daira daira self-assigned this Dec 19, 2023
@daira daira force-pushed the change-orchard-license branch from 6358a62 to 6a020df Compare December 19, 2023 22:15
@daira daira changed the title Switch orchard dependency to 0.6.1 and remove notices about the BOSL license Switch orchard dependency to 0.7.0 and remove notices about the BOSL license Dec 19, 2023
@daira daira force-pushed the change-orchard-license branch from 6a020df to c7b0f3d Compare December 19, 2023 22:18
@daira daira changed the title Switch orchard dependency to 0.7.0 and remove notices about the BOSL license Switch orchard dependency to 0.7 and remove notices about the BOSL license Dec 19, 2023
@daira daira mentioned this pull request Jan 11, 2024
@daira daira force-pushed the change-orchard-license branch from c7b0f3d to a0bea05 Compare January 14, 2024 02:03
@daira daira changed the title Switch orchard dependency to 0.7 and remove notices about the BOSL license Remove notices about the BOSL license Jan 14, 2024
@daira daira marked this pull request as ready for review January 14, 2024 02:18
@daira daira requested a review from str4d January 14, 2024 02:20
@codecov
Copy link
Copy Markdown

codecov bot commented Jan 14, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (efc0d7d) 66.17% compared to head (76f9226) 66.17%.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1071   +/-   ##
=======================================
  Coverage   66.17%   66.17%           
=======================================
  Files         114      114           
  Lines       11063    11063           
=======================================
  Hits         7321     7321           
  Misses       3742     3742           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Copy Markdown
Contributor

@str4d str4d left a comment

Choose a reason for hiding this comment

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

Changes LGTM. However, I double-checked, and in main we currently patch in zcash/orchard@1892573 which is the tip of a branch that does not include the license change. Its child merge commit zcash/orchard@ba70c32 does include the license change. If we wait until #1108 merges then this PR's changes will be correct.

@daira daira marked this pull request as draft January 16, 2024 20:17
@str4d
Copy link
Copy Markdown
Contributor

str4d commented Jan 16, 2024

#1108 has merged, so this can now be rebased.

…needed.

Signed-off-by: Daira Emma Hopwood <daira@jacaranda.org>
@daira daira force-pushed the change-orchard-license branch from a0bea05 to 76f9226 Compare January 17, 2024 23:31
@daira daira marked this pull request as ready for review January 17, 2024 23:32
@daira daira merged commit 2be6166 into zcash:main Jan 18, 2024
@daira daira deleted the change-orchard-license branch January 18, 2024 01:11
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 notices about the BOSL license after updating orchard dependency

2 participants