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

Update to gh-pages towards fixing 472 #624

Merged
merged 0 commits into from
Feb 13, 2015

Conversation

dhermes
Copy link
Contributor

@dhermes dhermes commented Feb 12, 2015

There will be an accompanying PR for master to build with these new rules.

This makes a hierarchy

  • /master/
  • /latest/ (alias for latest)
  • /0.4.0/
  • /0.3.0/

and adds index.html to do a redirect to /latest.

Also (as the update in the master branch will show), for the master subdirectory, the version is replaced by the commit hash (first 7 hex digits, via --pretty=%h).

Finally, by using a fresh build, I removed some old files which correspond to deleted code:

 delete mode 100644 master/_modules/gcloud/datastore/dataset.html 
 delete mode 100644 master/_modules/gcloud/storage/exceptions.html
 delete mode 100644 master/_modules/gcloud/storage/key.html
 delete mode 100644 master/_sources/datastore-dataset.txt
 delete mode 100644 master/_sources/storage-keys.txt
 delete mode 100644 master/datastore-dataset.html

@googlebot googlebot added the cla: yes This human has signed the Contributor License Agreement. label Feb 12, 2015
@dhermes
Copy link
Contributor Author

dhermes commented Feb 12, 2015

@tseaver GitHub is not happy about the size of this commit so I will just push from the command line.

For review purposes, to give an idea of how the commits were made:

  1. Moving all pages into master subdirectory (b4b226c)
git checkout gh-pages
git mv * master/  # Leaves .nojekyll intact
git commit ...
  1. Updating "master" docs with a clean build. (2323c88)

    git checkout master
    # Make change to docs/conf.py as in PR #625
    SPHINX_RELEASE=$(git log -1 --pretty=%h) tox -e docs
    mv docs/_build/html master_DOCs/
    git checkout gh-pages
    git rm -fr master/
    mv master_DOCs/ master/
    git add master/
    git commit ...
    
  2. Adding 0.4.0 docs in own folder and in latest. (02c903b)

git checkout v0.4.0
# Change to docs/conf.py from PR #625 not needed
tox -e docs
mv docs/_build/html v0.4.0_DOCs/
git checkout gh-pages
mv v0.4.0_DOCs/ latest/
cp -r latest/ 0.4.0/
git add latest/ 0.4.0/
git commit ...
  1. Adding root redirect to the latest docs. (d0713e7)

This one is human reviewable.

@tseaver
Copy link
Contributor

tseaver commented Feb 13, 2015

I'd say go ahead and merge -- review isn't that feasible. We can tweak later as needed.

@dhermes
Copy link
Contributor Author

dhermes commented Feb 13, 2015

Agreed, I wasn't expecting you to be able to review anything other than my methods.

I need to hold off on pushing this until right before #625 gets merged or it will break the build process for merges.

@dhermes
Copy link
Contributor Author

dhermes commented Feb 13, 2015

Also, instead of a rebase I'm going to wipe away (git push -f) all the commits since a8df46b.

Merging #625 right after will restore the master docs to the tip of master.

@tseaver
Copy link
Contributor

tseaver commented Feb 13, 2015

LGTM

@dhermes dhermes merged commit d0713e7 into googleapis:gh-pages Feb 13, 2015
@dhermes dhermes deleted the gh-pages-472-update branch February 13, 2015 22:26
vchudnov-g pushed a commit that referenced this pull request Sep 20, 2023
Source-Link: googleapis/synthtool@5f2a608
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:8555f0e37e6261408f792bfd6635102d2da5ad73f8f09bcb24f25e6afb5fac97

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla: yes This human has signed the Contributor License Agreement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants