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

fix(appservice): Remove erroneous ? operator #764

Merged
merged 1 commit into from
Jun 14, 2022

Conversation

agraven
Copy link
Contributor

@agraven agraven commented Jun 14, 2022

Fixes the issue caused by merging #747

@jplatte jplatte enabled auto-merge June 14, 2022 13:09
@codecov
Copy link

codecov bot commented Jun 14, 2022

Codecov Report

Merging #764 (de04aba) into main (e8b2655) will increase coverage by 5.77%.
The diff coverage is 90.34%.

@@            Coverage Diff             @@
##             main     #764      +/-   ##
==========================================
+ Coverage   71.59%   77.37%   +5.77%     
==========================================
  Files         117       94      -23     
  Lines       16474    13735    -2739     
==========================================
- Hits        11795    10627    -1168     
+ Misses       4679     3108    -1571     
Impacted Files Coverage Δ
crates/matrix-sdk-base/src/store/ambiguity_map.rs 82.35% <ø> (ø)
crates/matrix-sdk-crypto/src/error.rs 0.00% <ø> (ø)
crates/matrix-sdk-crypto/src/olm/account.rs 82.29% <ø> (+0.27%) ⬆️
crates/matrix-sdk-crypto/src/olm/mod.rs 97.24% <ø> (ø)
...es/matrix-sdk-crypto/src/olm/signing/pk_signing.rs 77.88% <ø> (-16.46%) ⬇️
crates/matrix-sdk/src/client/mod.rs 81.63% <65.21%> (+0.03%) ⬆️
crates/matrix-sdk/src/http_client.rs 88.75% <69.23%> (+0.65%) ⬆️
crates/matrix-sdk-appservice/src/lib.rs 71.36% <80.00%> (+5.67%) ⬆️
crates/matrix-sdk-crypto/src/identities/user.rs 70.54% <85.71%> (+2.73%) ⬆️
crates/matrix-sdk-appservice/tests/tests.rs 96.44% <86.36%> (-1.51%) ⬇️
... and 78 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5243091...de04aba. Read the comment docs.

@jplatte jplatte merged commit 87639a4 into matrix-org:main Jun 14, 2022
@Hywan
Copy link
Member

Hywan commented Jun 14, 2022

👍

@johannescpk
Copy link
Contributor

I'm curious, how did that slip through CI?

@jplatte
Copy link
Collaborator

jplatte commented Jun 27, 2022

@johannescpk #747 was not up to date with main at the time of merging, where a function had been made non-fallible (and the PR introduced a new call to that function with ? after it).

GitHub has a setting that requires PRs to be up-to-date before merging, but I would argue that's overkill as cases like this are very rare and that setting require manual intervention on a daily basis. There's other solutions such as CI systems that maintain a merge queue where things go through another level of testing before being integrated into the main branch (see for instance Zuul, which I've wanted to try out for Ruma), but they're not as readily available as GitHub actions.

@MTRNord
Copy link
Contributor

MTRNord commented Jun 27, 2022

GitHub has a setting that requires PRs to be up-to-date before merging, but I would argue that's overkill as cases like this are very rare and that setting require manual intervention on a daily basis. There's other solutions such as CI systems that maintain a merge queue where things go through another level of testing before being integrated into the main branch (see for instance Zuul, which I've wanted to try out for Ruma), but they're not as readily available as GitHub actions.

Good old bors I think is also something which could do this. Iirc rust used this for a while.

@johannescpk
Copy link
Contributor

johannescpk commented Jun 28, 2022

@jplatte Ah, understood, thanks for the explanation. That's why 5243091 s CI failed after merging - so it became instantly obvious.

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.

5 participants