Skip to content
This repository was archived by the owner on Sep 30, 2020. It is now read-only.

Build on s3 #149

Closed
wants to merge 4 commits into from
Closed

Build on s3 #149

wants to merge 4 commits into from

Conversation

edunham
Copy link
Member

@edunham edunham commented Jun 19, 2015

See #148 .

Sorry about the gnarly PR; a vast majority of it is simply to bring the master branch of this repo up to date with the gh-pages branch.

The only new commits are a5ced88 (adding .travis.yml to upload rendered site into S3 bucket) and 97b1674 (add custom error page).

My rationale behind merging into master is that I'd like to leave the github-pages site totally untouched until I've verified that everything about the S3 copy is integrated correctly.

Before merging, could someone with permissions on this repo please flip the Travis switch at https://travis-ci.org/profile/rust-lang to green?

graydon and others added 4 commits August 31, 2011 09:42
Since the site is moving off of github pages, it would be better to use
conventional branch naming.

Doing this as a merge commit because I doubt github would handle a PR of
branch renaming gracefully, and we want to keep the github-pages site
operational during the transition.
See https://travis-ci.org/edunham/rust-www/builds/67560526 and
http://www-rust-lang-org.s3-website-us-west-1.amazonaws.com/ for an example of
it successfully working. That was built specifying `edunham/rust-www`, whereas
the file now specifies `rust-lang/rust-www` because we want to automate builds
after this PR lands.
@rust-highfive
Copy link

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @pcwalton (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. The way Github handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@edunham
Copy link
Member Author

edunham commented Jun 19, 2015

Going to rebase and make a new PR since master is now up to date with gh-pages.

@edunham edunham closed this Jun 19, 2015
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.

4 participants