Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

bump solana_rbpf from 0.2.5 to 0.2.7 #16515

Merged
merged 3 commits into from
Apr 13, 2021
Merged

bump solana_rbpf from 0.2.5 to 0.2.7 #16515

merged 3 commits into from
Apr 13, 2021

Conversation

mvines
Copy link
Contributor

@mvines mvines commented Apr 13, 2021

No description provided.

@mvines mvines requested a review from Lichtso April 13, 2021 18:11
@mvines
Copy link
Contributor Author

mvines commented Apr 13, 2021

@Lichtso - looks like 0.2.7 has build issues with master

@jackcmay
Copy link
Contributor

@Lichtso - looks like 0.2.7 has build issues with master

@mvines I'm looking into it

@Lichtso
Copy link
Contributor

Lichtso commented Apr 13, 2021

I am on it already, just waiting for my local tests to run through

@mvines
Copy link
Contributor Author

mvines commented Apr 13, 2021

Cool, I'd like this to make it into v1.6 before we ship a new release to testnet, to give some soak time before upgrading mainnet to use it. I was hoping we'd ship a new 1.6 release today

@Lichtso
Copy link
Contributor

Lichtso commented Apr 13, 2021

@mvines You will have to pull the commit in here: https://github.com/Lichtso/solana/tree/bump_rbpf

@mvines
Copy link
Contributor Author

mvines commented Apr 13, 2021

@mvines You will have to pull the commit in here: https://github.com/Lichtso/solana/tree/bump_rbpf

Can you just push to this PR?

@Lichtso
Copy link
Contributor

Lichtso commented Apr 13, 2021

@mvines I see, and done

@mvines
Copy link
Contributor Author

mvines commented Apr 13, 2021

syscalls::tests::test_translate_type failed.

@Lichtso - if this is getting late for you, we can delay shipping the next 1.6 release until tomorrow

@Lichtso
Copy link
Contributor

Lichtso commented Apr 13, 2021

Argh, that was stupid mistake of mine and here is the fix in RBPF.

Instead of releasing an entire new version for this hot fix I would suggest to just deactivate the last two lines of the test temporarily (until the next RBPF release), as the method resize_region is not used anywhere else.

@jackcmay
Copy link
Contributor

@mvines I can help with the backporting while @Lichtso is sleeping

@codecov
Copy link

codecov bot commented Apr 13, 2021

Codecov Report

Merging #16515 (7731de1) into master (f641429) will increase coverage by 0.0%.
The diff coverage is 100.0%.

@@           Coverage Diff           @@
##           master   #16515   +/-   ##
=======================================
  Coverage    80.0%    80.0%           
=======================================
  Files         413      413           
  Lines      112207   112206    -1     
=======================================
+ Hits        89850    89873   +23     
+ Misses      22357    22333   -24     

@jackcmay jackcmay merged commit f7eadd9 into solana-labs:master Apr 13, 2021
mergify bot pushed a commit that referenced this pull request Apr 13, 2021
(cherry picked from commit f7eadd9)

# Conflicts:
#	cli/Cargo.toml
#	programs/bpf/Cargo.toml
#	programs/bpf_loader/Cargo.toml
#	programs/bpf_loader/src/syscalls.rs
mergify bot pushed a commit that referenced this pull request Apr 13, 2021
(cherry picked from commit f7eadd9)

# Conflicts:
#	cli/Cargo.toml
#	programs/bpf/Cargo.toml
#	programs/bpf_loader/Cargo.toml
#	programs/bpf_loader/src/syscalls.rs
mergify bot added a commit that referenced this pull request Apr 13, 2021
* bump solana_rbpf from 0.2.5 to 0.2.7 (#16515)

(cherry picked from commit f7eadd9)

# Conflicts:
#	cli/Cargo.toml
#	programs/bpf/Cargo.toml
#	programs/bpf_loader/Cargo.toml
#	programs/bpf_loader/src/syscalls.rs

* Fix conflicts

Co-authored-by: Michael Vines <mvines@gmail.com>
Co-authored-by: Jack May <jack@solana.com>
Lichtso pushed a commit that referenced this pull request Apr 14, 2021
mergify bot added a commit that referenced this pull request Apr 14, 2021
(cherry picked from commit f7eadd9)

Co-authored-by: Michael Vines <mvines@gmail.com>
@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
@Lichtso Lichtso removed their request for review September 20, 2021 08:07
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants