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.

Sign up for GitHub

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

Jump to bottom

Update to Cadence v0.31.5-account-linking-improved-pragma #4042

Merged
merged 3 commits into from
Mar 14, 2023
Merged

Update to Cadence v0.31.5-account-linking-improved-pragma #4042

merged 3 commits into from
Mar 14, 2023

Conversation

turbolent
Copy link
Member

@turbolent turbolent commented Mar 13, 2023 •
edited

@turbolent turbolent requested a review from a team March 13, 2023 23:35
@turbolent turbolent self-assigned this Mar 13, 2023
@turbolent
Copy link
Member Author

bors merge

bors bot added a commit that referenced this pull request Mar 14, 2023
@bors @turbolent
Merge #4042
ace7a8f 
4042: Update to Cadence v0.31.5-account-linking-improved-pragma r=turbolent a=turbolent

See onflow/cadence#2380

Co-authored-by: Bastian Müller <bastian@axiomzen.co>
@bors
Copy link
Contributor

bors bot commented Mar 14, 2023

Build failed:

@turbolent
Copy link
Member Author

bors retry

bors bot added a commit that referenced this pull request Mar 14, 2023
@bors @turbolent
Merge #4042
f10ef44 
4042: Update to Cadence v0.31.5-account-linking-improved-pragma r=turbolent a=turbolent

See onflow/cadence#2380

Co-authored-by: Bastian Müller <bastian@axiomzen.co>
@bors
Copy link
Contributor

bors bot commented Mar 14, 2023

Build failed:

  • Integration Tests (make -C integration epochs-tests)

@turbolent
Copy link
Member Author

bors retry

bors bot added a commit that referenced this pull request Mar 14, 2023
@bors @turbolent
Merge #4042
e0e3163 
4042: Update to Cadence v0.31.5-account-linking-improved-pragma r=turbolent a=turbolent

See onflow/cadence#2380

Co-authored-by: Bastian Müller <bastian@axiomzen.co>
@bors
Copy link
Contributor

bors bot commented Mar 14, 2023

Build failed:

@turbolent
Copy link
Member Author

Integration tests seem to be so flaky, bors can't merge it ... OK to just merge?

@turbolent
Copy link
Member Author

bors merge

@bors
Copy link
Contributor

bors bot commented Mar 14, 2023

Build succeeded:

@bors bors bot merged commit f0097ce into v0.29.16-height-coordinated-upgrade Mar 14, 2023
@bors bors bot deleted the bastian/v0.29-update-cadence-v0.31.5-account-linking-improved-pragma branch March 14, 2023 21:10
@turbolent turbolent mentioned this pull request Mar 24, 2023
Merged
bors bot added a commit that referenced this pull request Mar 27, 2023
@bors @turbolent
Merge #4097
ca1fa9d 
4097: Port account linking test PRs from v0.29 to master r=janezpodhostnik a=turbolent

Port #4042 and #4032 to `master`

Co-authored-by: Bastian Müller <bastian@axiomzen.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pattyshack pattyshack pattyshack approved these changes

@SupunS SupunS SupunS approved these changes

@j1010001 j1010001 j1010001 approved these changes

@janezpodhostnik janezpodhostnik janezpodhostnik approved these changes

@gomisha gomisha Awaiting requested review from gomisha

@yhassanzadeh13 yhassanzadeh13 Awaiting requested review from yhassanzadeh13

@ramtinms ramtinms Awaiting requested review from ramtinms

Assignees

@turbolent turbolent

Labels
Improvement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@turbolent @pattyshack @SupunS @j1010001 @janezpodhostnik