Merge pull request #13 from OPENDAP/update_creds

rework credentials for gh-pages build

.travis.yml

@@ -1,59 +1,39 @@
-
 sudo: required
-
-# whitelist
 branches:
   only:
-    - master
+  - main
+env:
+  global:
+  # GIT_USER_EMAIL  
+  - secure: HdfxfrRpUfGYKyfvs9MS3rS28Se77kSIWtvRN+zcsHSSmbVgqsPhHPs4FJ6cJm5iAjfTX/865RB/JEV+3Pof0SvYpHBFfbPTOpLU+eNv7r1891hEo3Ueuo77nEwb/CjpAtsPfK/FJ3dLhEroBPb8g92gxncMr26WO+grP2SR4yvwQj844WJzSHrC5roGoxciuzJlNtjgdJ0xehUVxNv5N0Q2gcO3uqtwMOBezUiTPFx4kGDCsEb5r7RE99X1FdFbrh8IA7p8ZmukBy3SdIqf9MOXQno58DsSOL1hj0iZ86x1p1qAiroAkZK3rLa3j1hI6fhbvUZ+uPoVssHrjiCTxJwer6M0YJsUZJOzVPk6OCdS5oaOCvKVDDUa3L006zuDXqQQArBOxf9eKIWVx2IRpVN3Su2AV2vhyf3Mrb956x7QvzaJcKmEi0DiJHt9hu0uc1zyivxXBy7Z9VwOnWkXu4eBEyPT4kqhKiUGhPWvNqr5uQSe4ush3EPgoOcWNt7BtLe9vqfpeqWPvekTJdG8axMW0Fgfhz9vZ/eRP4oTYXUfiasr2LqPq8jXdjxpP1eD7hBG6qy02kNj8Xht6G4w4d+QlE0eOIAJC3y3JxwFDeOCLm2U9JdQNX7MZWAvdgVUfLiVXnW6tKc4xuf4U9+3xvUXwxNw+wBbNBTmgrtCbXI=
+  # GIT_USER_NAME
+  - secure: LGVGf0IVmeRLIeF8NDHpG/WLaD5eStqAWBib/1Ea+LN6yBwNZndG52R32jiXXpENaZdhlwBMYv8K/mQDZAhZlDlSQ1JoLg4Q08R60Jx3ZHWNfNcPs8PhgUh8e71hEfPMNIxcoiJlXtWq3oAX+saTsjhwtxh7H8hQ93Xa9tz/6dDoA0WsR2NOcW7vjNgxmq3337wUQuMGMhSZZGy3kddoTQe/I1kvcQDFHY4kK0uScI61Y9k3Y0eaSf+UEyw6bcwIwalVkYadJhyLGWojcHCav233t2ox6OH0lPkLfvyuohH9XTKBWPQJ5VVdsLLLK0aVztYNIDDupbVIRahX6zVlxHocwC4RqHwZ4sHhkYXYI5r2mqfQFWWvtGcEM8fxDGdHr2JI7u7mm0BJHPHBcUNHcqqxlyKPwDXajRPH+K6cP7MmyTsWFCNzHqpF7+b35MQQyJZj+YsEdsEuWtpnrONfvTByRu9gXHithxjfSXsGKk6Btpi6pyfmdbJxRUnv+OVjJNokJagx9/RliBpNDIFJBb/wsb7R96WUQbs5t2y+i217+Eov3yKgu6rslUMRH93/Ami+Dwk7oLWhaWo8WtO9by0BRBghM1IFyhQedeFCd8+O7KKDm+tNY0pJ4d0kbU+FV/JnQ4neb1KY3zTO72MAL5Xb1Q8aWnyAbC2EwPYr+qI=
+  # GIT_UID
+  - secure: l+Nh3HrIYULB84YoeGFpIMau7RZ+FnvwF6jqAEv9UbTvpNJCvcZWjNsjlpfZUIrFe4muG2qJdUn0iu/9nBjZXmKHH61P2SogF56lczLo/aJGIDr/sIbOHgGsb2nWbiGXjOGgm0QAeIyFRMOEc0mE7rXtGTL+5xuxn0blf91BVGPh12yHr0+kV9EtztnztYGpIt+wp7cEufEnk3YlkyFszu12Jlcfn3yVEhzNj9ksREtzLrUluVTDuQY3H8Kk7eH35eKrVJQdpqZIldtODEPKh3WEPFQ63wzGjYGTM7jV9SO1Q89COcBWoWj+EjpzjYERp25cu9wYfRakLfTh8tYXbRctX5thYV3qjco30t88A2ivWMOeilfi1OnZM94NFcYLZRtkE+4GOQjV6l5mytfEGL4MkpbiSUsA2NOQ/WaUxmGf9/LMpwpC6fTyZQ3zTreVRzXK8YnYWMpU/RFVTLRTlMyr7QUpnd89illf2TKupcTyVu9zUMaHnwwArM4w4vW+Xn2zYb1GHfiFWoiyktwz1+pUpOK1Lk2Z/YRDg7RtQRbDKO0slvCh1TfzcHTan/YfteLCRQWina6yrm4Pf6FCVd0oXq287TRHrP0FuLWzLEbLTaqsccFp/v7aOyG6oYuZntnxSU82ovmn6v3FdacMfuWokU4OR3SG8HSggMO7KuA=
+  # GIT_TOKEN
+  - secure: DDSrtnt8x+vEYJF4kDhGQWCLvzDYbni6v0sWR+eh2h1tfUMWVblAHLIq+BR4GTg1uEhKxGbEhCMeNda/FE/mubnjx512RkGZyJYdCEPbwNN9pxDm7Duh24mSubMZeLWmTgJeC9oV7sFq28/3p7xk0oUhQMLujZjE2Fx3XK7BqmUS+Uyes3S6EORkODcJkkyTQwMFbgVOJDZYelrSqi18cAk7cOg9erJcHLEdqh7dtQeNa1XcS3VttK99JBzNtF/B/G3naRLpf5Vh2LCWv9HMxcu/XDFXR8IWEai14PqJNzImFRAUh4Ex7TaeWlOJ878/ahg85vR3A3ywtjGoYjNTo9p8k140EBx1irbj0FEXdIvVfOhjxMG30GWz2ZtNJSWbYoiXO2BskmmNuXENgMoy2ytI0POPjZ6joaIov/pR5aitbY6Xe2MTwVXiRIYPk5tPKucz9BGpUHnPMzNoCD3x/g11AJewBMKzZe6mCZNnYW3oAgbXnBQ4m0BaHoh/Cd0TpNOQP/hNC8pgoRi2GmpxywjMcpDTmOFMT8JchHXlqyGNVRmikSCsMG2Sfzmv9hkCJQznu6C+UW1H5rfUPUQwUQ1FaVCYRVjJY88re4C1PIVl/bKIacENzs+kblnfpxF07Q17P3zPNGCj4Yfgomk5O3ZvBIIarrRdm5tgOuT8AKM=
 
 notifications:
   email:
-    - ndp@opendap.org
-    - jgallagher@opendap.org
-env:
-  global:
-    # DOCKER_HUB_UID for our DockerHub account
-    - secure: "ZftSYLtJ7JUrajD2vW8GTYOpiOQXYf4Qtjcp8NWyWvCW0PlXR0UtyILAdZGIAip3DNhPWiJGjTCAwENhbkrjdhwY+SChBzIGylEq8flaerzN1jJ6yBAzVCKS1pB71QWHKNWDC2TwIMS1qWnXO5Q/t+4CoytoCIqGQdaTEwDnkHAG/zg+VFjynIC5MBlY3UBKXvy17mLBJJZdwoJojWZAP2QEHcPHn8e9RRWTD658Y355mppHXds2/gdWPqwFIY5qqnZyYWmZJ3/pG7nmpjrS9BoEdCanRrKcc50mheBpaEhcoiIS4b1aMfq/pVqX9r7Pn3KnFL+29fuWKLHjZoqrYHELQIcDgwkkxtzMVSxRA0swrN2GwVdD7M9lTdTZW0vOziglYSV83+wie8Hyi752V4mB6AzPzL6dAk0aZZge5ibStJPz7lLTiBPGcYSVFpQy7fMkgrTKwefnZi0Zor8TbBHzhK6Im3QAy31rwmyJE29YMpjk5/xdJ4edcbI+/30ADXUwwASj2nYLl6860WPrxwqKMyDM5UzzuD1EwfdlT9z6yTpSGJe0D8OFracfYc+UheD7EbcI9pOxTDo7CwnhEvTFhwRYsZ2B7dpd4bT+ViqjZxt94meYd6aAXa5t1lTXI2MqDUkb7t40FPazWf0AjNx+0w2KBdpT0tkO7COiOOM="
-    # DOCKER_HUB_PSWD for our DockerHub account
-    - secure: "SR2drAEGlDi7F7yVAflRKsBamSRNdDQWA8yffmPqx3tmOpASwdNx7qzELSyScAs8wTHes5ZiyaAh9Xc4lEUQAwS0528hC48E8XCPvEruQp0AEJc3to9sNffwFQjJ7fFDxtc1kCihrIR4+HjYZKX0VSoSlgi307lbrhU5+F9n8NyDiG6qLpGGFpcJQc9tUBBveIwkFpBn92pHFs8pfwHw+m+4RkpanmhYKAyUuYLScRWprFsOLevGF31gtaRs/VVRXotmEta44ENud6odGiVLHsyA9CL6MH+OyE2srfu4WMNgSOairUZCDusbl0RQNVw+qHknoILSFTI6gOmCEYDQU6iVn0LB3VRf58zAzr4eYr1a/Ik2Z7raJ9EOrsDb1dnuzeXc8gJzSb4CxU8mQBCxnhd+Gc0EiIAQ2WHeCF3YtuQK2bIoXDrM02ACqWqIJSVBBLTWxvHGIFaZA5l2ZALIL0EKdLLz9K77PzdNN7zzkn+h3VGOXUVUcrtZv411/OoZrFRHS+qkmwumdtoi68xLwBZibEci2b59jb904CaSmotG+JmuoYr9dVHo1E7ZRSJw1wCNAsxKUpqPzvS8S8mw4wyqILvJ20AFT/b5tb+9tab390gZEy0kYK+bkkGceJyF0OKY6NAAnhOkxhZ94lfg9I+mi3TE51vE0RXIYTaVDcY="
-    # GIT_UID
-    - secure: "mdJZfmb5eoyoRVkd7wJBKwHH1glNfLm6VHUKPzIByw+0W6xf1Ru9BiYPgI/s6LdGSy5w3ggwjWjWzJjrnOdjNqOSTgpfd5JibgRRmW/s047i1p7j+mxKXWdkzAUtB0rCycE4pqRL6G7RRMLMtbb9QwVfdCVrWLVT9K/VooM240BZ2fjnWngJ8Tm9hpZsUuHMGgZ4xWjnK8zahIcb4u2p0B5QEwgLQH/eDyIFrP12VO2ffFBYSBQy/0De7r1E60zpzuZVrLsVwkY5NHh/MkV9MS12qzGatvMVlSLhzLPk7cjj4BP10uyNun5+w9jYkz/zQ7sd3Ukta++KHmxQnRVSkNbN9xCnX5uNwi6/TP3MysiSB3mr4KJQxGQzo4cuci5+RaUalvntAkZrzpNBapxTJi6Oa2fCi4wtvhj7cWVPxLVySNRKp+cYCxkW7W0ILMpDlnptxYx8Gx4YJNIJDORFGeKRb8fdQCjQw+AQWy/bacDsnWb6sAYwb8/asMDygk3M3gLr2lRLwjaax4M3zgvrxS0aErCthmfYKxXzr3uWbwddbJPF3FsVWEBbcJ5/VihG6p1F+ASLuM0zmZWvqrGgvLGe6oj2Y1bKwG8WL+JZqFIPdwF0oK5ddk0iQNLQlNM051yWrK2kmYxMX24saYROJtyQLZUrmiMHDgnWK+3eT20="
-    # GIT_TOKEN
-    - secure: "Ee8x6gPumMFPBTlxDb0NlmkI+kRDMYU9C/3G/dNlrcnk8Mq38NV4cuTZNIetcuQ3KSHVPTAww8bvoNsi5wc5vUIov9nXq+DIe4hQk9CTPyzhq89gU0WyEuYuuodmLjxu6BJbmR+u8JrI4f+qj1oYWuEN7HW38IUOcq18oCppxPG3Y0QlMQ6AKF3lDcXk2zT1hT9y8v8rToFS7wFPJ1rqJI7qmtBCiiV0QwVHAmCH0ZL5pHxWASl4ZTGHoYT9WmGuCb2W1HL+/HET8rwUsnexHWjYzCDUdKDr2cnevO1b1R+OKIPe+GC+2mcQYjybndkdxADS6MZODwujfFFKcTp/3T+H8O0+sZBJfvhdb+WAYJMUe3OC9ywVCn/75dHqYCHnxcMz6gwd8Ks9aeq7d34Po0HTsXxmvExHH8ar0d5uHXjYTcWF2WV3hVtlOJamnbLSLfgCU6qmZ2bW3XzO0+aOJjxHo0H8+3txKQebXEBV/DLdmkvS+DLwjhX86yMY7E1G8iqyLDAtQBMzIoDH/BTti26T1InFX6HjuVUa0kazEMrGUmBFqK5EMTkXIbQ9UR7pBwfLoU6ayJZ51le5+fdOYda/CswHteMFz4j8h3u5TzZCQ/jFNaeqYMIbY4nOal54hhm07uCjlRwIHaZ4XypPHJIeTTckmHoyq5pj9K1lrAg="
+  - ndp@opendap.org
+  - jgallagher@opendap.org
+  - "{GIT_USER_EMAIL}"
 
 services:
-  - docker                  
-
+- docker
 before_install:
-  - echo $DOCKER_HUB_PSWD | docker login -u $DOCKER_HUB_UID --password-stdin
-  - mkdir -p output
-  - docker pull asciidoctor/docker-asciidoctor
-
-# Name the file explicitly until we sort out the organization of the 'documentation'
-# project.
-
+- mkdir -p output
+- docker pull asciidoctor/docker-asciidoctor
 script:
-  # Inject the version information
-  - GUIDE_VERSION=`cat VERSION`"-${TRAVIS_BUILD_NUMBER}"
-  - echo ${GUIDE_VERSION}
-  - cat Master_Hyrax_Guide.adoc | sed -e "s|GUIDE_VERSION|${GUIDE_VERSION}|g" > index.adoc
-  # Build the Guide as HTML
-  - docker run -v $TRAVIS_BUILD_DIR:/documents/ --name asciidoc-to-html asciidoctor/docker-asciidoctor asciidoctor -a toc=left -a docinfo=shared -D /documents/output index.adoc
-  - mv ./output/index.html ./output/Master_Hyrax_Guide.html
-  # - docker run -v $TRAVIS_BUILD_DIR:/documents/ --name asciidoc-to-pdf asciidoctor/docker-asciidoctor asciidoctor-pdf -D /documents/output Master_Hyrax_Guide.adoc
-
-after_error: 
-  - docker logs asciidoc-to-html
-  #- docker logs asciidoc-to-pdf
-
+- GUIDE_VERSION=`cat VERSION`"-${TRAVIS_BUILD_NUMBER}"
+- echo ${GUIDE_VERSION}
+- cat Master_Hyrax_Guide.adoc | sed -e "s|GUIDE_VERSION|${GUIDE_VERSION}|g" > index.adoc
+- docker run -v $TRAVIS_BUILD_DIR:/documents/ --name asciidoc-to-html asciidoctor/docker-asciidoctor
+  asciidoctor -a toc=left -a docinfo=shared -D /documents/output index.adoc
+- mv ./output/index.html ./output/Master_Hyrax_Guide.html
+after_error:
+- docker logs asciidoc-to-html
 after_failure:
-  - docker logs asciidoc-to-html
-  #- docker logs asciidoc-to-pdf
-
-# This is a bit different than the 'after_success' section in the 'documentation'
-# repo because that build installs the github.io index.html page from its
-# README.adoc file. I extracted the Hyrax Guide from that repo because of problems
-# getting the images to work in the online version of the Hyrax Guide. jhrg 10/11/17
-
-after_success:      
-  - ./travis/deploy_to_gh_pages.sh
+- docker logs asciidoc-to-html
+after_success:
+- ./travis/deploy_to_gh_pages.sh

travis/deploy_to_gh_pages.sh

@@ -39,21 +39,16 @@ gtag("js", new Date());\
 gtag("config", "G-RG7LQNLXQL");\
 </script>' Master_Hyrax_Guide.html
 
-
-#cat ${GUIDE_FILE} | sed -e "s/GUIDE_VERSION_TEMPLATE/${GUIDE_VERSION}/g" > foo
-#mv -f foo ${GUIDE_FILE}
-#head -25 ${GUIDE_FILE}
-
 # Now we set up the git repo
+git config --global init.defaultBranch "main"
 git init
-git config user.name "The-Robot-Travis"
-git config user.email "npotter@opendap.org"
-
+git config user.name "${GIT_USER_NAME}"
+git config user.email "{GIT_USER_EMAIL}"
 # Add and commit the content
 git add .
 git status
 git commit -m "COMMIT Deploying update to GitHub Pages"
 git status
 # Push to GitHub Pages
-git push --force -v "https://${GIT_UID}:${GIT_TOKEN}@github.com/OPENDAP/hyrax_guide" master:gh-pages; echo $?
+git push --force -v "https://${GIT_UID}:${GIT_TOKEN}@github.com/OPENDAP/hyrax_guide" main:gh-pages; echo $?
 git status