Page History

...

Set the click on the "Close Issue" button in JIRA.

Commit Process for Committers for the Apache Rya Website:

The repository for Apache Rya website is at https://gitbox.apache.org/repos/asf/incubator-rya-site.git.  

- master branch is the source in markdown for the Jekyll tool.
- asf-site branch is the compiled HTML that is deployed to the webserver.

Part 1 (merging into master): Follow the steps above, but using the incubator-rya-site repository to merge the changes from the PR made against the master branch of the incubator-rya-site repository into the incubator-rya-site master branch

Part 2 (merging into asf-site): If a corresponsing PR was made against the asf-site branch, and that PR corresponds to the changes made to master, you can follow the steps similar with Part 1 to merge into asf-site. Be sure that the asf-site matches content in master.  It might be safer to ignore the asf-site pull request and compile the modifications from master as below:

Step 2.0 Install Jekyll if not already installed

Step 2.1 checkout master

git checkout master

Step 2.3 Build the website, test the changes, and compare the result with the current website. Note that different versions of jekyll will generate different structures for the website. If the new website has a different structure than the old, and that was not the intention (for example if a download.html file is created instead of download/index.html), update your version of jeckyll 

cd content/ 
bundle exec jekyll serve 

Step 2.3  Move the content/target folder out of the way, you will commit this separately.

    mv content/target/ ../

Step 2.4 Checkout asf/site, create a new branch, remove old content

git checkout --force origin/asf-site 
    git checkout -b another_new_branch_name_here
    rm -r content

Step 2.5 Now copy the folder formally named target/ into the project, renaming it to content/.

    mv ../target/ ./content

Step 2.6 Use git status to observe changes.  The css and other template files are probably not changed.  If they are flagged as modified, investigate CRLF or other trival differences.  See .gitattributes.  Try git diff  *css.  The file permissions might be different: chmod -R 755 *

Step 2.7  When satisfied that all looks OK, commit changes

    git add [new and modified files]

    git commit -a -m "say what you changed here"

Step 2.8 Merge the changes into asf-site

git checkout asf-site
git merge another_new_branch_name_here

Step 2.9 If there was a PR against the asf-site branch, amend the commit message so that it closes the PR (Github Info here). After running the command below, add the append the following line to the commit "Closes #123 from usrname/branchname".  Note theat "#123" refers to the PR number in GitHub

git commit --amend

Step 2.10 Push changes to Apache asf-site.

git push origin asf-site

Step 2.11: Delete PR branch.

git branch -D another_new_branch_name_here

Closing Stale Issues on Github

...