From 84ab0955e293bb88d5e0acd0cbd6628f7ac4faeb Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Wed, 20 Jun 2018 15:59:06 +0200
Subject: travis: Enable delivery of docs

---
 .travis.yml       | 26 +++++++++++++-------------
 scripts/build-otp | 34 +++++++++++++++++-----------------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 825fb8de87..ea71726fb5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,19 +49,19 @@ matrix:
     - env: Linux64Docbuild
       script:
         - ./scripts/build-otp docs
-      ### Disabled for now, we do not want this to push to otp repo
-      # deploy:
-      #   provider: pages
-      #   skip-cleanup: true
-      #   keep-history: true
-      #   verbose: true
-      #   github-token:
-      #     secure: oea4VBDok/gSPwo82XRkM3C5mpyVrcgJfOHgzO01rN4UbWN615wpnTLmkwe9gtkiSwRNNT6GoZ8Rx0EM5ByS2H3qY65bj3M+clMgFAPBn7aHDmnWpi8pi8OBIMmIGxHYQn0hzY4ZCVZQ1FtzTrLZDqZrAZBAGdgDdlH9IrsnBDUKNKzU28UMEgXJKX7bwdHo5H7JGkKeGh6bMi7/s5f/MwTQgp5Iv+PUhCZ1II+Wxz+fh+B6O8kgpq6oaBLjKeaim8bpeQ/vER6Vbaf6ORH0JiJcivDeBAfOVXyx75Omam3fqEuAGW1tmvXWljijWI21WhWmjZc+s8z5ML9wEBKlw0w9BGlzVs7Z+nVtAxufx0YqTsMhlzruxzhaNxh+7jEAMsU9LzBR3AHugqV5xbp3cyYEhWQl+MkhtrKsjs2MyZeyL2T9aeXJBDC6Jb2mznjvHKm11r5oz986uGr88qbDrwT+arRVYDFBvG52nqXa+4Hn+qPoZqDl4JC0YQeVhkbYtpPS1CYkl7JAXev2L4wDSc9Cywr02tJCTrR/yWKEANyYtVl2PzNkKAAvtROpEJv6y3PxhBJzr+Qk/MDLZWGV0KN4gNIYSxFkTFUddbgF53ZnVKAh4tv/vr7Uxvup9Zy7pqF9h+p4jZ0Yq0Y1AESCorU+qfXAxnGiKO8dewuBQhI=
-      #   on:
-      #     # We only deploy on pushes to branches
-      #     tags: false
-      #     condition: $TRAVIS_PULL_REQUEST = "false"
-      #     repo: erlang/otp
+      deploy:
+        provider: pages
+        repo: erlang/cd
+        target-branch: master
+        skip-cleanup: true
+        keep-history: true
+        verbose: true
+        github-token: $ERLANG_CD_GITHUB_TOKEN
+        on:
+          # We only deploy on pushes to branches
+          tags: false
+          condition: $TRAVIS_PULL_REQUEST = "false"
+          repo: erlang/otp
     # This stage publishes a otp bundle that contains multiple
     # Erlang/OTP source repositories
     - stage: deploy
diff --git a/scripts/build-otp b/scripts/build-otp
index e33bf95286..c38d2c98de 100755
--- a/scripts/build-otp
+++ b/scripts/build-otp
@@ -57,23 +57,23 @@ if [ "$1" = "docs" ]; then
     do_and_log "Linting documentation" make xmllint
     # The code below prepares this build to be used as a deploy to
     # github pages for documentation.
-    # if [ "$TRAVIS_PULL_REQUEST" = "false" -a "$TRAVIS_TAG" = "" ]; then
-    #     set -x
-    #     rm -rf logs
-    #     SHA=`git rev-parse --verify HEAD`
-    #     DATE=`date -Iseconds`
-    #     git clean -xfdq -e $DOC_TARGET
-    #     git fetch https://github.com/$TRAVIS_REPO_SLUG gh-pages
-    #     git checkout -f FETCH_HEAD
-    #     rm -rf _docs/$DOC_TARGET
-    #     mv $DOC_TARGET _docs/$DOC_TARGET
-    #     echo "---" > _docs/$DOC_TARGET.md
-    #     echo "title: $DOC_TARGET" >> _docs/$DOC_TARGET.md
-    #     echo "sha: $SHA" >> _docs/$DOC_TARGET.md
-    #     echo "generated: $DATE" >> _docs/$DOC_TARGET.md
-    #     echo "---" >> _docs/$DOC_TARGET.md
-    #     set +x
-    # fi
+    if [ "$TRAVIS_PULL_REQUEST" = "false" -a "$TRAVIS_TAG" = "" ]; then
+        set -x
+        rm -rf logs
+        SHA=`git rev-parse --verify HEAD`
+        DATE=`git show -s --format=%ci`
+        git clean -xfdq -e $DOC_TARGET
+        git fetch https://github.com/erlang/cd master
+        git checkout -f FETCH_HEAD
+        rm -rf _docs/$DOC_TARGET
+        mv $DOC_TARGET _docs/$DOC_TARGET
+        echo "---" > _docs/$DOC_TARGET.md
+        echo "title: $DOC_TARGET" >> _docs/$DOC_TARGET.md
+        echo "sha: $SHA" >> _docs/$DOC_TARGET.md
+        echo "generated: $DATE" >> _docs/$DOC_TARGET.md
+        echo "---" >> _docs/$DOC_TARGET.md
+        set +x
+    fi
 fi
 
 exit 0
-- 
cgit v1.2.3