The setup steps are the same as those used to create an environment to merge PRs for the incubator-quarks repo - except replace incubator-quarks with incubator-quarks-website:
The ones that @ddebrunne initially suggested (and are noted in merge-pr :-), are: # Flow from Dan: # [one time] create a clone to use just for merging # cd ~/git # git clone https://git-wip-us.apache.org/repos/asf/incubator-quarks.git clone-incubator-quarks # cd clone-incubator-quarks # git remote add mirror https://github.com/apache/incubator-quarks.git # (you can instead use a git@github url but you'll have to have ssh setup) > On Apr 12, 2016, at 6:28 PM, Susan Cline <[email protected]> wrote: > > I checked out master, and then I added ‘upstream’ remotes. I’m guessing this > is incorrect: > > 525 git clone https://github.com/home4slc/incubator-quarks-website.git > 529 git checkout master > 531 git fetch upstream <— I don’t think I should have done this, is this > okay? > 532 git remote -v > 533 git remote add upstream > https://github.com/apache/incubator-quarks-website.git > <https://github.com/apache/incubator-quarks-website.git> <— I don’t think I > should have done this, should this be instead ‘git remote add mirror > https://github.com/apache/incubator-quarks-website.git' > <https://github.com/apache/incubator-quarks-website.git'> ?? > 536 git fetch upstream <— I don’t think I should have done this, is this > okay? > 537 git pull origin master > 538 git pull origin asf-site > 540 git fetch mirror pull/36/head:pr-36 <— this did not work since I don’t > have a remote ‘mirror’. > > If I add the mirror, at the url above can I continue? > > Thanks, > > Susan > > >> On Apr 12, 2016, at 10:30 AM, William Marshall <[email protected]> wrote: >> >> >> In order, the commands you run should look like similar to this: >> >> git checkout master # switch to >> master >> git pull origin master # update master >> git pull origin asf-site # update >> asf-site >> git fetch mirror pull/<XX>/head:pr-XX # fetch the changes from >> the pull request >> git merge pr-XX # update >> master with the PR's changes >> git push origin master # push updated >> master to apache git repo >> ./build.sh # >> Generate the html files, switch to asf-site, and update it >> git push origin asf-site # push updated >> asf-site to apache git repo >> >> >> On Mon, Apr 11, 2016 at 4:15 PM, Susan Cline <[email protected]> wrote: >> >>> I’m still confused about how, as a committer to make web site pull >>> requests. I’m looking at the information on the REAME.md >>> for committers ( >>> https://github.com/apache/incubator-quarks-website/blob/master/README.md < >>> https://github.com/apache/incubator-quarks-website/blob/master/README.md >>>> ): >>> >>> If you are a committer, do the following: >>> >>> Update the master branch with your (or a Pull Request's) change. >>> Push updated master to the asf remote master ( >>> https://git-wip-us.apache.org/repos/asf/incubator-quarks-site.git < >>> https://git-wip-us.apache.org/repos/asf/incubator-quarks-site.git>) >>> Run build.sh from the master branch directory (requires jekyll). This >>> checks out and updates the asf-site branch with a new commit of the build >>> from the current branch >>> >>> At this point, you should be on the asf-site branch. Simply push this >>> branch to the asf remote with git push origin asf-site and the site will >>> automatically be updated within seconds. >>> >>> Note: If you want to try out the website locally on the asf-site branch >>> before you push, you can do so with jekyll serve -d content >>> --skip-initial-build and point your browser to http://localhost:4000 >>> >>> >>> For 1, is this the git mirror or the apache site (I think apache)? what >>> is the exact sequence of git commands to update my branch with the pull >>> request change? >>> Are these correct? >>> >>> git checkout master >>> git pull >>> git fetch mirror pull/<XX>/head:pr-XX >>> git merge pr-XX >>> >>> 1a) - do the jekyll command ? >>> jekyll serve -d content —skip-initial-build >>> >>> For 2, >>> git push origin master >>> >>> 3) run build.sh >>> >>> 4) I’m confused what this means: ‘At this point you should be on the >>> asa-site branch.’ Wasn’t I always there? >>> >>> Susan >>> >>> >>> >>>> On Mar 23, 2016, at 4:30 PM, Dan Debrunner <[email protected]> wrote: >>>> >>>> Just a reminder about what Kathey wrote about getting the changes in >>> pull requests to be visible on the site: >>>> >>>> >>>>> For the website and documentation, to >>>>> publish you need to also put the generated content on the asf-site >>>>> branch. See the top level README.md at >>>>> >>> https://github.com/apache/incubator-quarks-website/blob/master/README.md >>>> >>>> >>>> >>>> >>> http://mail-archives.apache.org/mod_mbox/incubator-quarks-dev/201603.mbox/%3C56F06074.508%40apache.org%3E >>>> >>>> Dan. >>> >>> >
