Merge pull request #126 from ndw/fix-travis

Attempt to improve the build/release process
docbook · Nov 1, 2018 · c4ea165 · c4ea165
2 parents 3e1fac5 + c284edf
commit c4ea165
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 67 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,6 +11,8 @@ branches:
   - master
   - travis
   - "/^release.*/"
+  - "/^snapshot.*/"
+  - "/^ndw-test.*/"
 
 env:
   global:
@@ -41,13 +43,6 @@ after_success:
     .travis/publish-release.sh
   fi
 
-before_deploy:
-- git config --global user.email "builds@travis-ci.com"
-- git config --global user.name "Travis CI"
-- export GIT_TAG=snapshot/$(date -u "+%Y-%m-%d")-$TRAVIS_BUILD_NUMBER
-- git tag $GIT_TAG -a -m "Generated tag from TravisCI build $TRAVIS_BUILD_NUMBER"
-- git push https://$GITHUBTOKEN@github.com/docbook/xslt10-stylesheets $GIT_TAG
-
 notifications:
   email:
     on_success: change
@@ -58,19 +53,13 @@ notifications:
 
 deploy:
   provider: releases
-  prerelease: true
   api_key:
-    secure: C3XlJYP4Fr5bkZRTZWAEZiAi4FxxFWE8oWTwYEH0aBj5Duc+l/M4WUWlI7kuRvf4nJVYjJ4Ano55M6KGlXU1Nqrkzza/y9MFdWvvlDROhgwftmf4kiVBKSu/Db13jipne7hDu7N32aBA6jhS6f8hTUTYXrp1aojeY04czrBtzKjAvWjwBpZlPMhaQcxxg1ta18dLA2oo+k6XvNXIvZBVxumk6LlGWNmXPig5KTyntRJtFak5MplyPEQ6hYIq5HFS5nY3WOMIPW+io0mmr1ESr//98Z9Q6N0Pr5PCQadF0eOOlSYkY3ggEKT7v+g+uFrGnUHXnhcWmydy798RRr/ixbMd5jVtOWIRuGp7oQud1P2oY0ICPiF6S0a24alpELpnjGtqnZ4RH2jNQZhRgD71466Og5ZSsN09+HzXghY0KSUw65emgZGYN6LU0NgL+13PIje5Ow2E236wkDmlnxIkXvpr/UAQlyXR6QWHSG2gzgSn4zoHSHWRDc/5Jhgd0WDEnMV5U1SnC8w/bObjTvNhtIkXTDdMWLGQDR5Me4qg4IT0FtnpMai3aOvnRyMyfNy/yAY5jEX8bBwVDwXYxxIUz2O88zyxTWgZVM2OvUeVi9xKjtfskp9pwFs3xEB+Q8T8HFYAKmcVxxsW9U2C1Zy6Q2eKDrjXx/bn/27GecQa26k=
+    secure: f4w3jrlDESAlhSZIGzBLMbL5OVdQu+zG1SPmXHYN5GUacrV+WnxuhiuVsbkxKMasltIGVijeWWBnVMD8k8HF3YgWQad80TLgBTpUnWeQK5mrJ4SkdpVryjeS31ZU7sk7DaT4AdyaTvgunINTNO2XH2mp1J6Ou20f9z3up+7uy1PLQHb9WU4OojqzASmcH48dklDX4bjDejc7GgXV3EKydZsx7fCEBp6KpDZ+dkYheB1byBAEJ3DXpY3gTU0yt6oS8g8PXSmoTtqY6eWCv0UffWLGphqHAH/VEsZmQhlP+y7H8QFKXiPxFW6IsjigeJ4lBSpJ5oDoJVY5v1XhR7Oe8IHMVprvGl3OQbOO1tDp93fYKGqloF+p5V7AYY89Fg7JmWVTduLInShFRhXjt2TzjNdbo0VHVpKRnr01zDHWuOXcGgsMLO/K1jdyMWnYFoJd5OEhEMOqA7Q8hpi8YGmR3hZTanCiDGkpMpKqQG7quGSqidJBjC/wdo8mqNl2wNy7VyqVCOYUwnB9s5s6JjWykOEa5TX/oQ9kbWNLUf18Z9sfTkQwAJhuE1CmVbk6gosmo3ZlqBpLiuSYVLZC98fgRwv6p22Vy8SpH7Q6tVaTG3UoVaX+DggJYUXADWh7/eDvGYXw0OCE78SSktry/wfENUlKqnLEbzvcQAgqnl3sUro=
   file:
-  - dist/docbook-xsl-$VERSION.tar.bz2
-  - dist/docbook-xsl-$VERSION.tar.gz
   - dist/docbook-xsl-$VERSION.zip
-  - dist/docbook-xsl-nons-$VERSION.tar.bz2
-  - dist/docbook-xsl-nons-$VERSION.tar.gz
   - dist/docbook-xsl-nons-$VERSION.zip
-  - dist/docbook-xsl-doc-$VERSION.tar.bz2
-  - dist/docbook-xsl-doc-$VERSION.tar.gz
   - dist/docbook-xsl-doc-$VERSION.zip
+  skip_cleanup: true
   on:
-    repo: docbook/xslt10-stylesheets
-    branch: master
+    tags: true
+    all_branches: true
diff --git a/.travis/publish-release.sh b/.travis/publish-release.sh
@@ -4,50 +4,53 @@ here=$(dirname "${BASH_SOURCE[0]}")
 # Only commits to master should trigger deployment
 # (add 'travis' for testing purposes.)
 if [ "$TRAVIS_PULL_REQUEST" != "false" ] || \
-   [ "$TRAVIS_BRANCH" != master -a \
-     "$TRAVIS_BRANCH" != travis ]; then
+   [ "$TRAVIS_BRANCH" != master -a "$TRAVIS_BRANCH" != travis ]; then
     echo "Skipping deployment"
     exit 0
 fi
 
 # Remember the SHA of the current build.
 SHA=$(git rev-parse --verify HEAD)
 
-# Clone the minimum of the CDN repo needed.
-CDN_REPO="https://$GH_TOKEN@github.com/docbook/cdn.git"
-git clone $CDN_REPO cdn --depth=1 -q
-# Clean out existing content...
-rm -rf cdn/release/xsl/$VERSION
-rm -rf cdn/release/xsl-nons/$VERSION
-# ...and copy the new one.
-mkdir -p cdn/release/xsl
-mkdir -p cdn/release/xsl-nons
-rm -f cdn/release/xsl/index.html
-rm -f cdn/release/xsl-nons/index.html
-cp -a dist/docbook-xsl-$VERSION cdn/release/xsl/$VERSION
-cp -a dist/docbook-xsl-nons-$VERSION cdn/release/xsl-nons/$VERSION
-# We could normally make "current" symbolic links to "snapshot"
-# but github's policy doesn't allow to publish symbolic links in pages.
-rm -rf cdn/release/xsl/current
-rm -rf cdn/release/xsl-nons/current
-cp -a cdn/release/xsl/$VERSION cdn/release/xsl/current
-cp -a cdn/release/xsl-nons/$VERSION cdn/release/xsl-nons/current
+# Turning off temporarily
 
-# If there are no changes, bail out.
-# (Note that this doesn't detect additions.)
-#if (cd cdn && git diff --quiet); then
-#    echo "No changes to the output on this push; exiting."
-#    exit 0
-#fi
-
-$here/generate_index.py cdn/release/xsl
-$here/generate_index.py cdn/release/xsl-nons
-
-# Now prepare to commit and push to the CDN
-cd cdn
-git config user.name "Travis CI"
-git config user.email "travis-ci"
-
-git add .
-git commit -m "Deploy XSL Stylesheets to GitHub Pages: ${SHA}"
-git push -q origin HEAD
+# # Clone the minimum of the CDN repo needed.
+# CDN_REPO="https://$GH_TOKEN@github.com/docbook/cdn.git"
+# git clone $CDN_REPO cdn --depth=1 -q
+# # Clean out existing content...
+# rm -rf cdn/release/xsl/$VERSION
+# rm -rf cdn/release/xsl-nons/$VERSION
+# # ...and copy the new one.
+# mkdir -p cdn/release/xsl
+# mkdir -p cdn/release/xsl-nons
+# rm -f cdn/release/xsl/index.html
+# rm -f cdn/release/xsl-nons/index.html
+# cp -a dist/docbook-xsl-$VERSION cdn/release/xsl/$VERSION
+# cp -a dist/docbook-xsl-nons-$VERSION cdn/release/xsl-nons/$VERSION
+# # We could normally make "current" symbolic links to "snapshot"
+# # but github's policy doesn't allow to publish symbolic links in pages.
+# rm -rf cdn/release/xsl/current
+# rm -rf cdn/release/xsl-nons/current
+# cp -a cdn/release/xsl/$VERSION cdn/release/xsl/current
+# cp -a cdn/release/xsl-nons/$VERSION cdn/release/xsl-nons/current
+# 
+# # If there are no changes, bail out.
+# # (Note that this doesn't detect additions.)
+# #if (cd cdn && git diff --quiet); then
+# #    echo "No changes to the output on this push; exiting."
+# #    exit 0
+# #fi
+# 
+# $here/generate_index.py cdn/release/xsl
+# $here/generate_index.py cdn/release/xsl-nons
+# 
+# # Now prepare to commit and push to the CDN
+# cd cdn
+# git config user.name "Travis CI"
+# git config user.email "travis-ci"
+# 
+# git add .
+# git commit -m "Deploy XSL Stylesheets to GitHub Pages: ${SHA}"
+# git push -q origin HEAD
+
+echo "Ran publish-release.sh but it did nothing."
diff --git a/releasetools/Targets.mk b/releasetools/Targets.mk
@@ -39,7 +39,7 @@ ifeq ($(PDF_MAKER),dblatex)
 	&& $(DBLATEX) $(DBLATEX_FLAGS) \
 	  -p $(DBX_STYLE) \
 	  -o $@ \
-	  RELEASE-NOTES-STRIPPED-TMP.xml
+	  RELEASE-NOTES-STRIPPED-TMP.xml 2>&1 | $(TAIL)
 	$(RM) RELEASE-NOTES-STRIPPED-TMP.xml
 	$(RM) RELEASE-NOTES-TMP.xml
 endif
@@ -115,8 +115,6 @@ else
 # -----------------------------------------------------------------
 	rm -rf $(TMP)/docbook-$(DISTRO)-$(ZIPVER)
 	$(RM)  $(TMP)/tar.exclude
-	$(RM)  $(TMP)/docbook-$(DISTRO)-$(ZIPVER).tar.gz
-	$(RM)  $(TMP)/docbook-$(DISTRO)-$(ZIPVER).tar.bz2
 	$(RM)  $(TMP)/docbook-$(DISTRO)-$(ZIPVER).zip
 	umask 022; mkdir -p $(TMP)/docbook-$(DISTRO)-$(ZIPVER)
 	touch $(TMP)/tar.exclude
@@ -144,8 +142,6 @@ endif
 	fi
 # tar up distro, then gzip/bzip/zip it
 	-$(TAR) cf$(TARFLAGS) - -X $(TMP)/tar.exclude * .[^.]* | (cd $(TMP)/docbook-$(DISTRO)-$(ZIPVER); $(TAR) xf$(TARFLAGS) -)
-	umask 022; cd $(TMP) && $(TAR) cf$(TARFLAGS) - docbook-$(DISTRO)-$(ZIPVER) | gzip > docbook-$(DISTRO)-$(ZIPVER).tar.gz
-	umask 022; cd $(TMP) && $(TAR) cf$(TARFLAGS) - docbook-$(DISTRO)-$(ZIPVER) | bzip2 > docbook-$(DISTRO)-$(ZIPVER).tar.bz2
 	umask 022; cd $(TMP) && $(ZIP) $(ZIPFLAGS) docbook-$(DISTRO)-$(ZIPVER).zip docbook-$(DISTRO)-$(ZIPVER)
 	$(RM) $(TMP)/tar.exclude
 
@@ -162,8 +158,6 @@ ifneq ($(DISTRIB_PACKAGES),)
           fi; \
 	  rm -rf $(TMP)/$$dirname; \
 	  $(RM)  $(TMP)/tar.exclude; \
-	  $(RM)  $(TMP)/$$package_name.tar.gz; \
-	  $(RM)  $(TMP)/$$package_name.tar.bz2; \
 	  $(RM)  $(TMP)/$$package_name.zip; \
 	  umask 022; mkdir -p $(TMP)/$$dirname; \
 	  touch $(TMP)/tar.exclude; \
@@ -180,8 +174,6 @@ ifneq ($(DISTRIB_PACKAGES),)
 	  if [ -d $$dirname/images ]; \
 	    then mv $$dirname/images $$dirname/doc/; \
 	  fi) ; \
-	  umask 022; (cd $(TMP) && $(TAR) cf$(TARFLAGS) - $$dirname | gzip > $$package_name.tar.gz); \
-	  umask 022; (cd $(TMP) && $(TAR) cf$(TARFLAGS) - $$dirname | bzip2 > $$package_name.tar.bz2); \
 	  umask 022; (cd $(TMP) && $(ZIP) $(ZIPFLAGS) $$package_name.zip $$dirname); \
 	  $(RM) $(TMP)/tar.exclude; \
 	done

diff --git a/releasetools/Variables.mk b/releasetools/Variables.mk
@@ -239,3 +239,6 @@ SED_OPTS=
 
 GREP=egrep
 GREPFLAGS=
+
+TAIL=tail
+TAILFLAGS=
diff --git a/releasetools/xslnons.mk b/releasetools/xslnons.mk
@@ -9,7 +9,7 @@ zip-nons: zip
 	$(RM)  $(TMP)/docbook-$(DISTRO)-nons-$(ZIPVER).tar.bz2
 	$(RM)  $(TMP)/docbook-$(DISTRO)-nons-$(ZIPVER).zip
 	(cd $(TMP) && \
-	  unzip $(TMP)/docbook-$(DISTRO)-$(ZIPVER).zip && \
+	  unzip -qq $(TMP)/docbook-$(DISTRO)-$(ZIPVER).zip && \
 	  $(repo_dir)/releasetools/xslnons-build \
 	  docbook-$(DISTRO)-$(ZIPVER) \
 	  docbook-$(DISTRO)-nons-$(ZIPVER)); 

diff --git a/releasetools/xslns.mk b/releasetools/xslns.mk
@@ -9,7 +9,7 @@ zip-ns: zip
 	$(RM)  $(TMP)/docbook-$(DISTRO)-ns-$(ZIPVER).tar.bz2
 	$(RM)  $(TMP)/docbook-$(DISTRO)-ns-$(ZIPVER).zip
 	(cd $(TMP) && \
-	  unzip $(TMP)/docbook-$(DISTRO)-$(ZIPVER).zip && \
+	  unzip -qq $(TMP)/docbook-$(DISTRO)-$(ZIPVER).zip && \
 	  $(repo_dir)/releasetools/xslns-build \
 	  docbook-$(DISTRO)-$(ZIPVER) \
 	  docbook-$(DISTRO)-ns-$(ZIPVER));