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

Fix compilation failure on windows#10983

Merged
mergify[bot] merged 6 commits intosolana-labs:masterfrom
ryoqun:symlink-build-rs-windows
Jul 11, 2020
Merged

Fix compilation failure on windows#10983
mergify[bot] merged 6 commits intosolana-labs:masterfrom
ryoqun:symlink-build-rs-windows

Conversation

@ryoqun
Copy link
Copy Markdown
Contributor

@ryoqun ryoqun commented Jul 10, 2020

Problem

#8012 started to cause master CI travis windows build to fail.

Summary of Changes

Fixes https://travis-ci.com/github/solana-labs/solana/jobs/359548477#L616

@ryoqun ryoqun added the CI Pull Request is ready to enter CI label Jul 10, 2020
@solana-grimes solana-grimes removed the CI Pull Request is ready to enter CI label Jul 10, 2020
@ryoqun
Copy link
Copy Markdown
Contributor Author

ryoqun commented Jul 10, 2020

needs rebase on #10986.

I've confirmed windows now builds with this pr. :): https://travis-ci.com/github/solana-labs/solana/jobs/359595539#L600

@ryoqun ryoqun changed the title [wip] Fix compilation failure on windows [wip] [dont merge] Fix compilation failure on windows Jul 10, 2020
Comment thread .travis.yml
script:
- source ci/env.sh
- ci/publish-tarball.sh
deploy:
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

revert these removals before merging!!!

@ryoqun ryoqun force-pushed the symlink-build-rs-windows branch from 27d5256 to 22ae7aa Compare July 11, 2020 02:16
@ryoqun
Copy link
Copy Markdown
Contributor Author

ryoqun commented Jul 11, 2020

needs rebase on #10986.

rebased on #11000 (supersedes #10986) and windows build is fixed: https://travis-ci.com/github/solana-labs/solana/jobs/360070195

@ryoqun ryoqun changed the title [wip] [dont merge] Fix compilation failure on windows Fix compilation failure on windows Jul 11, 2020
@ryoqun ryoqun added the automerge Merge this Pull Request automatically once CI passes label Jul 11, 2020
@mergify mergify Bot merged commit 4046f87 into solana-labs:master Jul 11, 2020
@ryoqun
Copy link
Copy Markdown
Contributor Author

ryoqun commented Jul 13, 2020

Windows build on master restored: https://travis-ci.com/github/solana-labs/solana/jobs/360299694#L625

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

automerge Merge this Pull Request automatically once CI passes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants