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

Conversation

mvines
Copy link
Contributor

@mvines mvines commented Apr 28, 2020

No description provided.

@mvines mvines added the automerge Merge this Pull Request automatically once CI passes label Apr 28, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Apr 28, 2020
@mvines mvines added the automerge Merge this Pull Request automatically once CI passes label Apr 28, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Apr 28, 2020
@mvines mvines added the automerge Merge this Pull Request automatically once CI passes label Apr 28, 2020
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Apr 28, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@mvines
Copy link
Contributor Author

mvines commented Apr 28, 2020

@jackcmay - could you please take a look at this build error with 1.43.0, it's in the xargo goo that you're the most familiar with:

error: the `-Z unstable-options` flag must also be passed to enable `--extern crate_name` without `=path`

STR:

  1. cargo +1.43.0 test --manifest-path programs/bpf/Cargo.toml --no-default-features --features=bpf_c,bpf_rust --verbose -- --nocapture

@jackcmay
Copy link
Contributor

@mvines I can recreate locally, I'll dig into it

@jackcmay
Copy link
Contributor

@mvines, I have a fix, just need this to land first:
#9781

@mvines
Copy link
Contributor Author

mvines commented Apr 29, 2020

Sweet

@mvines
Copy link
Contributor Author

mvines commented Apr 29, 2020

@Mergifyio rebase

@mergify
Copy link
Contributor

mergify bot commented Apr 29, 2020

Command rebase: success

Branch has been successfully rebased

@jackcmay
Copy link
Contributor

The following PR fixes the CI issue seen in this PR
#9783

@mvines
Copy link
Contributor Author

mvines commented Apr 29, 2020

@Mergifyio rebase

@mergify
Copy link
Contributor

mergify bot commented Apr 29, 2020

Command rebase: success

Branch has been successfully rebased

@mergify
Copy link
Contributor

mergify bot commented Apr 29, 2020

Command rebase: success

Branch has been successfully rebased

1 similar comment
@mergify
Copy link
Contributor

mergify bot commented Apr 29, 2020

Command rebase: success

Branch has been successfully rebased

@mergify
Copy link
Contributor

mergify bot commented Apr 29, 2020

Command rebase: success

Branch has been successfully rebased

12 similar comments
@mergify
Copy link
Contributor

mergify bot commented Apr 29, 2020

Command rebase: success

Branch has been successfully rebased

@mergify
Copy link
Contributor

mergify bot commented Apr 29, 2020

Command rebase: success

Branch has been successfully rebased

@mergify
Copy link
Contributor

mergify bot commented Apr 29, 2020

Command rebase: success

Branch has been successfully rebased

@mergify
Copy link
Contributor

mergify bot commented Apr 29, 2020

Command rebase: success

Branch has been successfully rebased

@mergify
Copy link
Contributor

mergify bot commented Apr 29, 2020

Command rebase: success

Branch has been successfully rebased

@mergify
Copy link
Contributor

mergify bot commented Apr 29, 2020

Command rebase: success

Branch has been successfully rebased

@mergify
Copy link
Contributor

mergify bot commented Apr 29, 2020

Command rebase: success

Branch has been successfully rebased

@mergify
Copy link
Contributor

mergify bot commented Apr 29, 2020

Command rebase: success

Branch has been successfully rebased

@mergify
Copy link
Contributor

mergify bot commented Apr 29, 2020

Command rebase: success

Branch has been successfully rebased

@mergify
Copy link
Contributor

mergify bot commented Apr 29, 2020

Command rebase: success

Branch has been successfully rebased

@mergify
Copy link
Contributor

mergify bot commented Apr 29, 2020

Command rebase: success

Branch has been successfully rebased

@mergify
Copy link
Contributor

mergify bot commented Apr 29, 2020

Command rebase: success

Branch has been successfully rebased

@mergify
Copy link
Contributor

mergify bot commented Apr 29, 2020

Command rebase: failure

Branch rebase failed
err-code: 8F788

@mergify
Copy link
Contributor

mergify bot commented Apr 29, 2020

Command rebase: success

Branch has been successfully rebased

1 similar comment
@mergify
Copy link
Contributor

mergify bot commented Apr 29, 2020

Command rebase: success

Branch has been successfully rebased

@codecov
Copy link

codecov bot commented Apr 29, 2020

Codecov Report

Merging #9754 into master will decrease coverage by 0.0%.
The diff coverage is 100.0%.

@@           Coverage Diff            @@
##           master   #9754     +/-   ##
========================================
- Coverage    80.4%   80.4%   -0.1%     
========================================
  Files         281     281             
  Lines       64643   64524    -119     
========================================
- Hits        51979   51879    -100     
+ Misses      12664   12645     -19     

@mergify
Copy link
Contributor

mergify bot commented Apr 29, 2020

Command rebase: success

Branch has been successfully rebased

1 similar comment
@mergify
Copy link
Contributor

mergify bot commented Apr 29, 2020

Command rebase: success

Branch has been successfully rebased

@jackcmay
Copy link
Contributor

@mvines v1.0 and v1.1 will probably also need the rust-bpf bump and possibly related cache fix

@mvines
Copy link
Contributor Author

mvines commented Apr 29, 2020

@mvines v1.0 and v1.1 will probably also need the rust-bpf bump and possibly related cache fix

yeah I was thinking that. Can you backport those too?

@mvines
Copy link
Contributor Author

mvines commented Apr 30, 2020

Ok here we go!

@mvines mvines merged commit 230df0e into solana-labs:master Apr 30, 2020
mergify bot pushed a commit that referenced this pull request Apr 30, 2020
(cherry picked from commit 230df0e)

# Conflicts:
#	core/src/validator.rs
#	runtime/src/accounts_db.rs
mergify bot pushed a commit that referenced this pull request Apr 30, 2020
(cherry picked from commit 230df0e)
solana-grimes pushed a commit that referenced this pull request Apr 30, 2020
mvines added a commit that referenced this pull request Apr 30, 2020
* Upgrade to Rust 1.43.0 (#9754)

(cherry picked from commit 230df0e)

# Conflicts:
#	core/src/validator.rs
#	runtime/src/accounts_db.rs

* Update validator.rs

* Update accounts_db.rs

Co-authored-by: Michael Vines <[email protected]>
@ryoqun ryoqun mentioned this pull request Jun 15, 2020
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