Upstream main into main #24
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Clippy fix for CI
* Further improve credentials * Make clippy happy * Address review comments
* Introduce frankenstein framework * Remove inaccurate comment * Add fancy derefs * More derefs
* Remove cipher suite and version from Secret * Address review comments
Bumps [peaceiris/actions-gh-pages](https://github.com/peaceiris/actions-gh-pages) from 3 to 4. - [Release notes](https://github.com/peaceiris/actions-gh-pages/releases) - [Changelog](https://github.com/peaceiris/actions-gh-pages/blob/main/CHANGELOG.md) - [Commits](peaceiris/actions-gh-pages@v3...v4) --- updated-dependencies: - dependency-name: peaceiris/actions-gh-pages dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [peaceiris/actions-mdbook](https://github.com/peaceiris/actions-mdbook) from 1 to 2. - [Release notes](https://github.com/peaceiris/actions-mdbook/releases) - [Changelog](https://github.com/peaceiris/actions-mdbook/blob/main/CHANGELOG.md) - [Commits](peaceiris/actions-mdbook@v1...v2) --- updated-dependencies: - dependency-name: peaceiris/actions-mdbook dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: raphaelrobert <raphaelrobert@users.noreply.github.com>
Due to a recent vcpkg failure (in turn due to a bug in CMake), this PR disables interop testing with MLS++ on CI. Co-authored-by: raphaelrobert <raphaelrobert@users.noreply.github.com>
fixup build after #1548
This PR allows OpenMLS to handle unknown/other proposals analogous to how extensions are handled.
* Added test for updating unknown group context extensions data --------- Co-authored-by: cameronvoell <cameronvoell@users.noreply.github.com>
This reverts commit 7e11185.
Co-authored-by: Jan Winkelmann (keks) <jan@cryspen.com>
neekolas
approved these changes
Apr 26, 2024
neekolas
approved these changes
Apr 26, 2024
|
I spoke too soon. I clearly don't know how upstream, forks, and merges work. 😄 #25 But still not tooooo bad of a merge conflict. But definitely some stuff to work through now that the keystore is no longer. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pulls upstream openMLS to get the latest storageAPI work here: openmls#1565.