Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare release 1.6.0-rc.1 #376

Merged
merged 8 commits into from
Nov 10, 2023
Merged

Prepare release 1.6.0-rc.1 #376

merged 8 commits into from
Nov 10, 2023

Conversation

@sosthene-nitrokey
Copy link
Collaborator Author

This would fix #301

Copy link
Member

@robin-nitrokey robin-nitrokey left a comment

Choose a reason for hiding this comment

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

  • As this will probably be the last change before the release, I vote for merging and tagging the app PRs before merging this PR.
  • Please add the changed behavior (at least for opcard?) to the changelog.

@sosthene-nitrokey sosthene-nitrokey changed the title Use updated apdu-dispatch and dependencies Prepare release 1.6.0-rc.1 Nov 10, 2023
Comment on lines -23 to 28
apdu-dispatch = { git = "https://github.com/trussed-dev/apdu-dispatch.git", rev = "f8d5e7738ed328935411aa7a4114622ebc96287f" }
ctaphid-dispatch = { git = "https://github.com/trussed-dev/ctaphid-dispatch.git", rev = "94c97223ba8affaab08559c12105846b8fb14c7b" }
iso7816 = { git = "https://github.com/trussed-dev/iso7816.git", rev = "33f04012168f3a2341f57f7fc0a0e9baf7fd364d"}
trussed = { git = "https://github.com/trussed-dev/trussed.git", rev = "91d501b6a9bfe9588c26864f6f456e5702226b25" }
usbd-ctaphid = { git = "https://github.com/trussed-dev/usbd-ctaphid.git", rev = "3f24df2f8b799eb203539c0e723854e8f7739f79" }
apdu-dispatch = { git = "https://github.com/Nitrokey/apdu-dispatch.git", tag = "v0.1.2-nitrokey.2" }
ctaphid-dispatch = { git = "https://github.com/Nitrokey/ctaphid-dispatch.git", tag = "v0.1.1-nitrokey.3" }
iso7816 = { git = "https://github.com/Nitrokey/iso7816.git", tag = "v0.1.1-nitrokey.2"}
trussed = { git = "https://github.com/Nitrokey/trussed.git", rev = "v0.1.0-nitrokey.14" }
usbd-ctaphid = { git = "https://github.com/Nitrokey/usbd-ctaphid.git", tag = "v0.1.0-nitrokey.2" }
usbd-ccid = { git = "https://github.com/Nitrokey/usbd-ccid", tag = "v0.2.0-nitrokey.1" }
Copy link
Member

Choose a reason for hiding this comment

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

For these unreleased upstream changes, commits from the main branch would also be fine for me because we don’t force-push there. For forked or unreleased crates, the risk is much higher that we lose the commit at some point in the future. But of course tagging doesn’t hurt.

@sosthene-nitrokey sosthene-nitrokey merged commit 23a03a7 into main Nov 10, 2023
6 checks passed
@sosthene-nitrokey sosthene-nitrokey deleted the update-apdu-dispatch branch November 10, 2023 12:24
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