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

Chore: merge master into develop #3730

Merged
merged 138 commits into from
Jun 5, 2023
Merged

Conversation

pavitthrap
Copy link
Contributor

This merges the updates (up to latest epoch 2.4 release) in master back to develop.

igorsyl and others added 30 commits March 7, 2023 18:02
Docs: Update CONTRIBUTING.md, add PR review guidelines
Co-authored-by: Aaron Blankstein <[email protected]>
No AI code for the foreseeable future.
@codecov
Copy link

codecov bot commented May 30, 2023

Codecov Report

Merging #3730 (82c23c6) into develop (56493ac) will increase coverage by 0.53%.
The diff coverage is 80.77%.

@@             Coverage Diff             @@
##           develop    #3730      +/-   ##
===========================================
+ Coverage    85.08%   85.62%   +0.53%     
===========================================
  Files          298      302       +4     
  Lines       276674   286545    +9871     
===========================================
+ Hits        235397   245342    +9945     
+ Misses       41277    41203      -74     
Impacted Files Coverage Δ
...larity/src/vm/analysis/arithmetic_checker/tests.rs 98.39% <ø> (ø)
clarity/src/vm/analysis/errors.rs 72.09% <0.00%> (-0.34%) ⬇️
clarity/src/vm/analysis/read_only_checker/tests.rs 100.00% <ø> (ø)
clarity/src/vm/analysis/trait_checker/tests.rs 95.17% <ø> (ø)
.../src/vm/analysis/type_checker/v2_1/tests/assets.rs 100.00% <ø> (ø)
...c/vm/analysis/type_checker/v2_1/tests/contracts.rs 96.39% <ø> (ø)
...ity/src/vm/analysis/type_checker/v2_1/tests/mod.rs 99.08% <ø> (ø)
clarity/src/vm/tests/defines.rs 97.84% <ø> (ø)
clarity/src/vm/tests/sequences.rs 99.60% <ø> (ø)
clarity/src/vm/tests/simple_apply_eval.rs 99.56% <ø> (ø)
... and 69 more

... and 27 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@pavitthrap pavitthrap requested review from kantai and obycode May 31, 2023 17:12
Copy link
Member

@kantai kantai left a comment

Choose a reason for hiding this comment

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

This looks like it needs some merge fixes / artifact fixes -- the test build is currently failing on the branch.

@obycode
Copy link
Contributor

obycode commented Jun 1, 2023

In reviewing this, I noticed that there is nothing added to the changelog about the atlas changes. @jbencin please add something in a separate PR after this one is merged.

@obycode
Copy link
Contributor

obycode commented Jun 1, 2023

Looks like we are similarly missing a changelog entry for the named bitcoin wallet fix (89e0bca). @wileyj are you familiar enough with that one to add a changleog entry?

Copy link
Contributor

@obycode obycode left a comment

Choose a reason for hiding this comment

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

This looks good to me. I added two comments about missing changleog entries that I noticed while reviewing, that can be addressed in separate PRs.

@wileyj
Copy link
Contributor

wileyj commented Jun 1, 2023

Looks like we are similarly missing a changelog entry for the named bitcoin wallet fix (89e0bca). @wileyj are you familiar enough with that one to add a changleog entry?

outside of reading the commit, no - but it does look eerily similar to the changes in #3694 .
I can add a changelog though, the code/commit message is clear enough to do that

CHANGELOG.md Outdated Show resolved Hide resolved
remove additional `#`

Co-authored-by: Brice Dobry <[email protected]>
Copy link
Contributor

@wileyj wileyj left a comment

Choose a reason for hiding this comment

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

shipit

@pavitthrap pavitthrap merged commit b80dde4 into develop Jun 5, 2023
@blockstack-devops
Copy link
Contributor

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@stacks-network stacks-network locked as resolved and limited conversation to collaborators Nov 11, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
Status: Status: ✅ Done
Development

Successfully merging this pull request may close these issues.