Browse Source

For AppVeyor - ignore exit status from 'make doc' process.
[ci package] [ci only: AppVeyor]

Yao Wei Tjong 姚伟忠 10 years ago
parent
commit
136db85ad9
2 changed files with 8 additions and 5 deletions
  1. 7 4
      .appveyor.yml
  2. 1 1
      Docs/CMakeLists.txt

+ 7 - 4
.appveyor.yml

@@ -34,6 +34,9 @@ environment:
     - URHO3D_LIB_TYPE: SHARED
 matrix:
   fast_finish: true
+# Uncomment the init script below in order to get the RDP connection details to login into the worker box remotely while it is running
+#init:
+# - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 install:
   - ps: if ($env:APPVEYOR_REPO_TAG -eq "true" -or (!$env:APPVEYOR_PULL_REQUEST_NUMBER -and (select-string '\[ci package\]' -inputobject $env:APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED)))
         {
@@ -53,16 +56,16 @@ build_script:
   - if "%PLATFORM%" == "x64" set "OPTS=URHO3D_64BIT=1"
   - rake cmake vs2015 %OPTS% URHO3D_LIB_TYPE=%URHO3D_LIB_TYPE% URHO3D_D3D11=1 URHO3D_LUAJIT=1 URHO3D_LUAJIT_AMALG=1 URHO3D_EXTRAS=1 URHO3D_TESTING=1
   - rake make config=%CONFIGURATION%
-# Could run test target as AppVeyor does not have service similar to xvfb for headless GUI test run
+# Could not run test target yet as AppVeyor does not currently allow its service to interact with desktop
 # - rake make config=%CONFIGURATION% target=RUN_TESTS
-  - if "%PACKAGE_UPLOAD%" == "1" (rake make config=%CONFIGURATION% target=doc
-                                  rake make config=%CONFIGURATION% target=package)
+# Ignore the exit status from 'make doc' as Doxygen does not return correct exit status reliably
+  - ps: if ($env:PACKAGE_UPLOAD) { rake make config=%CONFIGURATION% target=doc >$null; rake make config=%CONFIGURATION% target=package }
 test: off
 artifacts:
   - path: ..\native-Build\*.zip
 deploy:
   - provider: FTP
-    host: urho-travis-ci@frs.sourceforge.net
+    host: frs.sourceforge.net
     protocol: sftp
     username: urho-travis-ci
     password:

+ 1 - 1
Docs/CMakeLists.txt

@@ -66,7 +66,7 @@ if (DOXYGEN_FOUND)
         foreach (IDE XCODE MSVC Eclipse CodeBlocks)
             enable_help (${IDE})
         endforeach ()
-        if (MSVC_HELP AND NOT DEFINED ENV{APPVEYOR})    # Skip when generating MSVC help on AppVeyor due to similar issue to #910
+        if (MSVC_HELP)
             find_package (HTMLHelp)
             # It is not an error when HTML help compiler is not found, instead just switching off the Doxygen's HHC option
             find_package_handle_standard_args (HTMLHelp REQUIRED_VARS HTML_HELP_COMPILER)