You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ad...@apache.org on 2016/11/05 04:48:11 UTC

[50/50] incubator-mynewt-site git commit: Merge branch 'master' of https://github.com/gj262/incubator-mynewt-site

Merge branch 'master' of https://github.com/gj262/incubator-mynewt-site

This closes #119


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/commit/a58d2e13
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/tree/a58d2e13
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/diff/a58d2e13

Branch: refs/heads/master
Commit: a58d2e130a9ff765a0dfdf96d78b4edceaff805f
Parents: 615b574 3451667
Author: aditihilbert <ad...@runtime.io>
Authored: Wed Oct 26 00:35:52 2016 -0700
Committer: aditihilbert <ad...@runtime.io>
Committed: Wed Oct 26 00:35:52 2016 -0700

----------------------------------------------------------------------
 build.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/a58d2e13/build.py
----------------------------------------------------------------------
diff --cc build.py
index e1fc469,d0334e7..dd97f1b
--- a/build.py
+++ b/build.py
@@@ -50,21 -45,11 +50,21 @@@ def buildForReal(site_branch)
      sh.mkdocs('build', '--clean')
  
      for version in cfg['extra']['versions']:
-         mygit.checkout(version['branch'])
+         sh.git('checkout', version['branch'], '--', 'docs', 'mkdocs.yml')
          deployVersion(version)
  
 +def buildForTest():
 +    print "Building site pages..."
 +    updateConfigVersion('develop')
 +    sh.rm('-rf', 'site')
 +    sh.mkdocs('build', '--clean')
 +    sh.git('checkout', '--', 'mkdocs.yml')
 +
 +    cfg = config.load_config()
 +    for version in cfg['extra']['versions']:
 +        deployVersion(version)
 +
  def deployVersion(version):
 -    mygit.checkout(version['branch'])
      buildTo(version['branch'])
      if version['latest']:
          buildTo('latest')