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

Upstream main into main #25

Merged
merged 47 commits into from
May 12, 2024
Merged

Upstream main into main #25

merged 47 commits into from
May 12, 2024

Conversation

nplasterer
Copy link

This pulls upstream openMLS to get the latest storageAPI work here: openmls#1565.

raphaelrobert and others added 23 commits April 3, 2024 15:21
* 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] <[email protected]>
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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: raphaelrobert <[email protected]>
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 <[email protected]>
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 <[email protected]>
Co-authored-by: Jan Winkelmann (keks) <[email protected]>
@nplasterer nplasterer self-assigned this Apr 26, 2024
Copy link

This PR is so big! Please, split it 😊

Copy link

This PR is so big! Please, split it 😊

Copy link

github-actions bot commented May 1, 2024

This PR is so big! Please, split it 😊

Copy link

github-actions bot commented May 8, 2024

This PR is so big! Please, split it 😊

Copy link

github-actions bot commented May 8, 2024

This PR is so big! Please, split it 😊

Copy link

This PR is so big! Please, split it 😊

Copy link

This PR is so big! Please, split it 😊

Copy link

This PR is so big! Please, split it 😊

Copy link

This PR is so big! Please, split it 😊

Copy link

This PR is so big! Please, split it 😊

Copy link

This PR is so big! Please, split it 😊

Copy link

This PR is so big! Please, split it 😊

@nplasterer
Copy link
Author

This upstream merge is becoming hard to manage. Going to merge this now that everything is green and open additional PRs if we find other things that need fixed for the storage migration.

@nplasterer nplasterer merged commit dcaef4c into main May 12, 2024
52 checks passed
@nplasterer nplasterer deleted the openmls-main branch May 12, 2024 17:13
@nplasterer nplasterer mentioned this pull request May 16, 2024
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.

7 participants