Pārlūkot izejas kodu

For Travis CI - ensure automated commit does not trigger another CI.
[ci skip]

Attempt to consolidate to use the same GitHub token for both urho3d/Urho3D.git and urho3d/urho3d.github.io.git repositories.

Yao Wei Tjong 姚伟忠 12 gadi atpakaļ
vecāks
revīzija
f0f2d1f0e2
2 mainītis faili ar 3 papildinājumiem un 4 dzēšanām
  1. 1 2
      .travis.yml
  2. 2 2
      Rakefile

+ 1 - 2
.travis.yml

@@ -8,8 +8,7 @@ script: ./cmake_gcc.sh -DURHO3D_LIB_TYPE=$TEST_LIB_TYPE -DENABLE_64BIT=1 -DENABL
 after_success: rake travis
 env:
   global:
-    - secure: ST80PPq8cTIZ5WRgX4BJ7gKhHonNge9GdYH0PuTvCZot13Rk+oNkbzkkCT/KuQHmyUU65gE2HCyMYYqNDNyxy0Upi8jMUjgXdy7SN5zORVhyc/Ymfd6rt3sgVOT6YYlbegI3sFLVdaH4jdyyMqPQHW72StZ25NUQi0p682FAGD0=
-    - secure: Ry36SYyKJ0WNuAd83q5vCUwU6Mm6I9DDWrJmo5DQmdh2rgiLggUBsWklo5eYVa1i6YkuDzaNIe/TKpCWrCJrdtwBVZ/ze8x859QoRp1yA9/GH/Ua9eWm7KmtG98W9fwbe3aLsdY329pTCvTuWBCWn6vbM/2zahwwHua1bGn4nyw=
+    secure: ST80PPq8cTIZ5WRgX4BJ7gKhHonNge9GdYH0PuTvCZot13Rk+oNkbzkkCT/KuQHmyUU65gE2HCyMYYqNDNyxy0Upi8jMUjgXdy7SN5zORVhyc/Ymfd6rt3sgVOT6YYlbegI3sFLVdaH4jdyyMqPQHW72StZ25NUQi0p682FAGD0=
   matrix:
     - TEST_LIB_TYPE=STATIC
     - TEST_LIB_TYPE=SHARED

+ 2 - 2
Rakefile

@@ -1,6 +1,6 @@
 require "rubygems"
 
-# Usage: NOT intended to be used manually (if you insist then try: GIT_NAME=... GIT_EMAIL=... GH_TOKEN=... GH_TOKEN2=... TRAVIS_BRANCH=master rake travis)
+# Usage: NOT intended to be used manually (if you insist then try: GIT_NAME=... GIT_EMAIL=... GH_TOKEN=... TRAVIS_BRANCH=master rake travis)
 desc 'Update site documentation to GitHub Pages'
 task :travis do
   # Skip documentation update if one of the following conditions is met
@@ -18,5 +18,5 @@ task :travis do
   system 'cd Build && make doc >/dev/null 2>&1 && rsync -a --delete ../Docs/html/ ../doc-Build/documentation' or abort 'Failed to generate/rsync doxygen pages'
   # Supply GIT credentials and push to GitHub
   system "cd doc-Build && git config user.name '#{ENV['GIT_NAME']}' && git config user.email '#{ENV['GIT_EMAIL']}' && git remote set-url --push origin https://#{ENV['GH_TOKEN']}@github.com/urho3d/urho3d.github.io.git && git add -A && git commit -q -a -m 'Travis CI: site documentation update at #{Time.now.utc}.' && git push -q" or abort 'Failed or nothing to push to urho3d/urho3d.github.io.git'
-  system "git config user.name '#{ENV['GIT_NAME']}' && git config user.email '#{ENV['GIT_EMAIL']}' && git remote set-url --push origin https://#{ENV['GH_TOKEN2']}@github.com/urho3d/Urho3D.git && git add Docs/*API* && git commit -q -a -m 'Travis CI: API documentation update at #{Time.now.utc}.' && git push -q" or abort 'Failed or nothing to push to urho3d/Urho3D.git'
+  system "git config user.name '#{ENV['GIT_NAME']}' && git config user.email '#{ENV['GIT_EMAIL']}' && git remote set-url --push origin https://#{ENV['GH_TOKEN']}@github.com/urho3d/Urho3D.git && git add Docs/*API* && git commit -q -a -m 'Travis CI: API documentation update at #{Time.now.utc}.\n[ci skip]' && git push -q" or abort 'Failed or nothing to push to urho3d/Urho3D.git'
 end