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

[V0.12] Cherry pick some fixes from master branch #3414

Merged
merged 9 commits into from
Mar 21, 2019

Conversation

pgarg66
Copy link
Contributor

@pgarg66 pgarg66 commented Mar 21, 2019

No description provided.

@codecov
Copy link

codecov bot commented Mar 21, 2019

Codecov Report

Merging #3414 into v0.12 will increase coverage by 0.1%.
The diff coverage is 98.8%.

@@           Coverage Diff           @@
##           v0.12   #3414     +/-   ##
=======================================
+ Coverage   80.8%     81%   +0.1%     
=======================================
  Files        131     131             
  Lines      20145   20235     +90     
=======================================
+ Hits       16291   16401    +110     
+ Misses      3854    3834     -20

@pgarg66 pgarg66 added the automerge Merge this Pull Request automatically once CI passes label Mar 21, 2019
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Mar 21, 2019
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

- ignoring, as cherry picking from master will bring in other
  unnecessary dependent changes
@pgarg66 pgarg66 added the automerge Merge this Pull Request automatically once CI passes label Mar 21, 2019
@solana-grimes solana-grimes merged commit 3f7cd4a into solana-labs:v0.12 Mar 21, 2019
@pgarg66 pgarg66 deleted the v0.12 branch March 21, 2019 20:45
@codecov-io
Copy link

Codecov Report

Merging #3414 into v0.12 will increase coverage by 0.1%.
The diff coverage is 98.8%.

@@           Coverage Diff           @@
##           v0.12   #3414     +/-   ##
=======================================
+ Coverage   80.8%     81%   +0.1%     
=======================================
  Files        131     131             
  Lines      20145   20235     +90     
=======================================
+ Hits       16291   16401    +110     
+ Misses      3854    3834     -20

behzadnouri pushed a commit to behzadnouri/solana that referenced this pull request Oct 31, 2024
joncinque added a commit to joncinque/solana that referenced this pull request Oct 31, 2024
#### Problem

The downstream SPL jobs were disabled in solana-labs#3414 because the crates
weren't being patched properly.

#### Summary of changes

Since the crates are now being properly patched in
solana-labs/solana-program-library#7434,
re-enable those jobs! At the same time, remove the patch to bump the
curve25519-dalek version.
joncinque added a commit to joncinque/solana that referenced this pull request Nov 1, 2024
#### Problem

The downstream SPL jobs were disabled in solana-labs#3414 because the crates
weren't being patched properly.

#### Summary of changes

Since the crates are now being properly patched in
solana-labs/solana-program-library#7434,
re-enable those jobs! At the same time, remove the patch to bump the
curve25519-dalek version.
alessandrod pushed a commit to alessandrod/solana that referenced this pull request Nov 5, 2024
…olana-labs#3416) (solana-labs#3421)

* CI: Re-enable downstream SPL jobs (solana-labs#3416)

#### Problem

The downstream SPL jobs were disabled in solana-labs#3414 because the crates
weren't being patched properly.

#### Summary of changes

Since the crates are now being properly patched in
solana-labs/solana-program-library#7434,
re-enable those jobs! At the same time, remove the patch to bump the
curve25519-dalek version.

(cherry picked from commit f9af09c)

# Conflicts:
#	.github/workflows/downstream-project-spl.yml

* Fix merge conflict

---------

Co-authored-by: Jon C <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this Pull Request automatically once CI passes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants