Merge pull request #65 from pah/travis-ci

travis-ci.org: improve config, debug GH_TOKEN issue

.travis.yml

@@ -6,10 +6,12 @@ compiler:
 
 env:
   matrix:
-    - config=debug64   config_suffix=debug_x64_gmake
-    - config=release64 config_suffix=release_x64_gmake
+    - CONF=debug
+    - CONF=release
   global:
-    secure: "CR3yKliFhwQLX+Zs1PCRcGej6jr4DIZsCqs9x6J2NN+U9Aow0gd/uiPBho/utgm+/TmSBji5n8FO/J3ORo34q4gC6EebTEaN4gCHNXVlIBJFw9x+Gs/lML5i8F2AoweFJY334OVaOf9qC8ZVJ8Z1nEwxj77fq3gcSLzRU3pIaS8="
+    # prepare for 32/64 bit multi-arch support
+    - BITS=64
+    - secure: "CR3yKliFhwQLX+Zs1PCRcGej6jr4DIZsCqs9x6J2NN+U9Aow0gd/uiPBho/utgm+/TmSBji5n8FO/J3ORo34q4gC6EebTEaN4gCHNXVlIBJFw9x+Gs/lML5i8F2AoweFJY334OVaOf9qC8ZVJ8Z1nEwxj77fq3gcSLzRU3pIaS8="
 
 before_install:
   - sudo add-apt-repository -y ppa:codegear/release
@@ -22,11 +24,11 @@ before_script:
   - pushd build && premake4 'gmake' && popd
 
 script:
-  - make -C build/gmake -f test.make
-  - make -C build/gmake -f example.make
+  - make -C build/gmake -f test.make    config=${CONF}${BITS}
+  - make -C build/gmake -f example.make config=${CONF}${BITS}
   - pushd bin
-  - ./unittest_${config_suffix}
-  - valgrind --leak-check=full --error-exitcode=1 ./unittest_${config_suffix}
-  - if [ "$config" = "release64" ]; then ./perftest_${config_suffix}; fi
+  -  ./unittest_${CONF}_x${BITS}_gmake
+  - valgrind --leak-check=full --error-exitcode=1 ./unittest_${CONF}_x${BITS}_gmake
+  - if [ "$CONF" = "release" ]; then ./perftest_${CONF}_x${BITS}_gmake; fi
   - popd
   - ./build/travis-doxygen.sh;

build/travis-doxygen.sh

@@ -81,15 +81,19 @@ gh_pages_push() {
 	# check for secure variables
 	[ "${TRAVIS_SECURE_ENV_VARS}" = "true" ] || \
 		skip "Secure variables not available, not updating GitHub pages."
+	# check for GitHub access token
 	[ "${GH_TOKEN+set}" = set ] || \
 		skip "GitHub access token not available, not updating GitHub pages."
+	[ "${#GH_TOKEN}" -eq 40 ] || \
+		abort "GitHub token invalid: found ${#GH_TOKEN} characters, expected 40."
 
 	cd "${TRAVIS_BUILD_DIR}/doc/html";
 	# setup credentials (hide in "set -x" mode)
 	git config core.askpass /bin/true
 	( set +x ; git config credential.${GHPAGES_URL}.username "${GH_TOKEN}" )
 	# push to GitHub
-	git push origin gh-pages
+	git push origin gh-pages || \
+		skip "GitHub pages update failed, temporarily ignored."
 }
 
 doxygen_install