travis+appveyor: fix deployment

every smoke/relprep build should trigger a github release (nightly).
esp. a windows sfx exe.
and then also full tagged builds.
on linux this should trigger Porting/makerel

Author: rurban

.travis.yml

@@ -28,35 +28,68 @@ branches:
   - /smoke/
   - /coverity/
   - /^maint-/
+  - /^cperl-/
 env:
   matrix:
-  - CONFIGURE_OPTION='' XCC='gcc' XBITS=64
-  - CONFIGURE_OPTION='-Duse64bitint' XCC="'gcc\ -m32'" XBITS=32
-  - CONFIGURE_OPTION='-DDEBUGGING -Duseshrplib' XCC='clang'
-  - CONFIGURE_OPTION='-Duse64bitall -Dusethreads -Duselongdouble' XCC='clang'
-  - CONFIGURE_OPTION='-Dusethreads -DDEBUGGING -Duse64bitall -Dld=c++' XCC='c++'
+  - CONFIGURE_OPTION='' XCC='gcc' XBITS=64 DEPLOY=1
+  #- CONFIGURE_OPTION='-Duse64bitint' XCC="'gcc\ -m32'" XBITS=32
+  #- CONFIGURE_OPTION='-DDEBUGGING -Duseshrplib' XCC='clang'
+  #- CONFIGURE_OPTION='-Duse64bitall -Dusethreads -Duselongdouble' XCC='clang'
+  #- CONFIGURE_OPTION='-Dusethreads -DDEBUGGING -Duse64bitall -Dld=c++' XCC='c++'
   global:
     secure: t+N5w1yMOdTvDIu7g09ujEQ80Rz0p/hV+uYnoPBex0pSHJKAvEWqL/PltzTNaOwoh9BRjJiSCaO6Owbpib5skZw+kwx6G+jeMzI+m00VI2P2//xUasG2KaYH1CTu+o2BE16cmZFjDs1R2UKYuTg/2lzY0SoUuNYcAr7MDUnc6hdx/uC0B37vW//MlDb/I+3bi4Wjkg+zH2T2dWqcaKP9cL4O1Oa9ApEZgaQcSv26MmBrGJm0dKaorF5vVf1xkVe6lfKVPCepcI424wkEbmBfZs5I8FajYdWscEQ0KxYY9paWUA9/71uREhuu2tecN9sc2ym2PV5ycHn0igixwuWqMV69iTO+CW7bX+1mFdfMq/TsnhRhwGVTpt0aBTup9VOkjZAqtqcc4ziQ15R6sIrAorzz97v2oFXL+q5FPQuqtY4opw8QsrnjAmonoBjNIZau8mX1VAyBTOTJjfY2bZQXNqpxFoGAfQgDhDjA+EYiQ8dK8glBOPxlEWeCeOFgA/ddrTFSTMCbDd3f0dJIOs8aQHAGcIpKEI2/3DY2JNvotku5e1us16v3YSLJwaWV4pEh3UaGhVU74TrzfA4NiOaf54OXSjLJVuBrpEMyPwVHxF5NA3W7zj9vACxcexRQAu3ms0J6XOaGYZuk5jYkefVpUILdPuSqVhRIs7Y4LqzqAYA=
 matrix:
   fast_finish: true
+  allow_failures:
+    - env: TRAVIS_OS_NAME=linux CONFIGURE_OPTION='-Dusethreads -DDEBUGGING -Duse64bitall -Dld=c++' XCC='c++'
 script:
-- test -n $TRAVIS_TAG && CONFIGURE_OPTION="$CONFIGURE_OPTION -Dusedevel";
-  ./Configure -des -Uversiononly -Dcc="$XCC" $CONFIGURE_OPTION -Dprefix=$HOME/cperl/usr &&
-  make -j4 -s
-- if [ ${TRAVIS_OS_NAME} = "linux" -o -z "`echo $CONFIGURE_OPTION | grep 'DDEBUGGING'
+- CFG=$CONFIGURE_OPTION ;
+  test -n "$TRAVIS_TAG" && CONFIGURE_OPTION="$CFG -Dusedevel";
+  test -z "$DEPLOY" && CONFIGURE_OPTION="$CONFIGURE_OPTION -Dprefix=$HOME/cperl/usr";
+  ./Configure -des -Uversiononly -Dcc="$XCC" $CONFIGURE_OPTION &&
+  make -s -j4 || ( test "${TRAVIS_OS_NAME}" = "linux" -a
+    "${CFG}" = "-Dusethreads -DDEBUGGING -Duse64bitall -Dld=c++" && true )
+  # skip test on darwin debugging (too slow). also: do install only once
+  #was: TEST_JOBS=4 make -s -j4 test_harness && make -s install && $HOME/cperl/usr/bin/cperlivp -p;
+- if [ "${TRAVIS_OS_NAME}" = "linux" -o -z "`echo $CONFIGURE_OPTION | grep 'DDEBUGGING'
   2>/dev/null`" ]; then
-    TEST_JOBS=4 make -s -j4 test_harness && make -s install && $HOME/cperl/usr/bin/cperlivp -p;
+    if [ -n "$DEPLOY" ]; then
+      TEST_JOBS=4 make -s -j4 all install DESTDIR=$HOME/cperl-inst ;
+    else
+      TEST_JOBS=4 make -s -j4 test_harness ;
+    fi
   fi
+after_success:
+  # deploy on condition does not work
+  - if [ -z "$DEPLOY" ]; then exit 0; fi
 before_deploy:
-- if [ -z $CONFIGURE_OPTION -a test -n $XBITS ]; then
-    tar -czvf cperl-${TRAVIS_TAG}-${TRAVIS_OS_NAME}${XBITS}.tar.gz -C $HOME/cperl *;
+  # every tag release
+- if [ "${TRAVIS_OS_NAME}" = "linux" -a -n "$DEPLOY" ]; then
+    make distclean >/dev/null 2>/dev/null ;
+    git clean -dxf ;
+    perl Porting/makerel -bx ;
+  elif [ "${TRAVIS_OS_NAME}" = "darwin" -a -n "$DEPLOY" ]; then
+    version=`Porting/perl_version` ;
+    out=../`git describe --long --tags --always`.pkg ;
+    echo "<pkg-info></pkg-info>" > .pkginfo ;
+    pkgbuild --identifier cperl --root DESTDIR=$HOME/cperl-inst
+      --info .pkginfo --version $version --ownership recommended $out ;
+  else
+    exit 0 ;
   fi
 deploy:
   provider: releases
-  file: cperl-${TRAVIS_TAG}-${TRAVIS_OS_NAME}${XBITS}.tar.gz
+  file_glob: true
+  file:
+    - ../cperl-*.tar.*
+    - ../cperl-*.pkg
+  api_key:
+    secure: "cF/kOo548pG4lL4BBCIS0T5ruFJO7xq6Tkcr+5SacXxfJKbdK9hue/nUahViskVNeI3c5VpggTJwMvS+kolAIJtasBbsea1eqCw2juQHkr7GWFOqJs9MzhFSO1+FPOBMiIQghA2eTJupDeZPjandjqy8J5BB+xXuIYjxQ+m5xxwxDNnZPjEw0+V2rTvfGAmNsQA80DpUsXfiUJNSa5rD7tujDUxbtnHrUVYfSfaHpO4o6n7vvtfOqNIKXigG6IaOXGvlVYt/Zwj9lyYcj8ZJpbKSSTEDiN5A8yugwAA/JrXI/CBO5Ex802napXxTj9vC1GQU58fxiTRo0aeTjwldU5TN82GFmyDXvPRcY/teJTTH19XlDeffle7KPmd2bk33wGloAOXUkKapQJVWh7SGer57XF/DYcycPJdcbxCVZCAHOua+JxA/4JNFKn+qyLqC6ASKGimmZ4Q0AmcGtGdR36vls9IaOIOBGXyKktoA9H4yI1sr+yAnrjZV9Fk6ngdjB7zXTMtR7ccc0BSb6xX5mo90XjJPogyaRzWJEeAJrFNluM15B6R2uwv3hR3MdSFuzEAdcMcWFeiGzyvGMcnGwk556CItSgdWz8cyXa3lkdkI405drAZ79oHhRUbbRrmCJnUd1MKpPev2wb5Y4KKk/O59s2mar5V5ORML35Pfq9w="
   skip_cleanup: true
+  overwrite: true
   on:
     tags: true
+    condition: $DEPLOY=1
 notifications:
   irc:
     channels:

appveyor.yml

@@ -10,24 +10,40 @@ platform:
   - x86
 environment:
   matrix:
-    - MSVC_VERSION: 10
-    - MSVC_VERSION: 12  
+    - MSVC_VERSION: 12
+    #- MSVC_VERSION: 10
+    #- MSVC_VERSION: 14
 clone_depth: 1
 branches:
   only:
     - master
-    - /smoke/
+    - /^smoke/
     - /^maint-/
+    - /^cperl-/
 init:
   - git config --global core.autocrlf input
+  # Disable popups as they hang the build as there is nobody to click on the OK button...
+  # Hanging the build is a lot less user friendly than reporting a build failure.
+  #
+  # Disable of system hard error popup
+  # See: https://msdn.microsoft.com/en-us/library/bb513638%28VS.85%29.aspx
+  - reg add "HKLM\SYSTEM\CurrentControlSet\Control\Windows" /f /v ErrorMode /d 2
+  # Disable the following popup on program failure:
+  #     |       ** <program name> has stopped working **        |
+  #     | Windows can check online for a solution to the problem|
+  #     |  - Check online for a solution and close the program  |
+  #     |  - Close the program                                  |
+  # See: https://msdn.microsoft.com/en-us/library/bb513638%28VS.85%29.aspx
+  - reg add "HKLM\Software\Microsoft\Windows\Windows Error Reporting" /f /v DontShowUI /d 1  
+  #- cmd: if "%MSVC_VERSION%" == "12" cinst 7zip.commandline -y
   - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 
 # from https://github.com/apache/lucy-clownfish/blob/master/appveyor.yml  
 build: off
 
 test_script:
   - 't\appveyor-smoke.bat'
-  
+
 # nope: https://ci.appveyor.com/project/rurban/cperl/build/job/ui7b0dk0gprw1eo2
 #  - cinst ruby.devkit
 #  - cinst make
@@ -41,30 +57,56 @@ test_script:
 #test_script:
 #  - mingw32-make test
 
-deploy_script:
-- cmd: >-
-    if "%MSVC_VERSION%" == "10" exit /b
-    nmake install CCTYPE=MSVC120 USE_NO_REGISTRY=define
-    C:\cperl\bin\cperlivp
-    7z a -y -sfx cperl-%APPVEYOR_REPO_TAG_NAME%-win%PLATFORM%.exe c:\cperl\
-    del /s /f /q C:\cperl
+#deploy_script:
+#  - IF "%MSVC_VERSION%"=="10" exit /b
+#  - IF "%DEPLOY%"=="" exit /b
+#  - IF "%APPVEYOR_REPO_TAG%"=="true" (
+#    7z a -y -sfx %APPVEYOR_REPO_TAG_NAME%-win%PLATFORM%.exe c:\cperl\
+#    )
+#  - IF "%APPVEYOR_REPO_TAG%"=="false" (
+#    7z a -y -sfx cperl-%appveyor_build_version%-win%PLATFORM%.exe c:\cperl\
+#    )
+#  - del /s /f /q C:\cperl
 
+# appveyor cannot glob * in names
 artifacts:
-  - path: cperl-$(APPVEYOR_REPO_TAG_NAME)-win$(PLATFORM).exe
-    name: cperl-$(APPVEYOR_REPO_TAG_NAME)-win$(PLATFORM).exe
+  - path: cperl-$(appveyor_build_version)-win32.exe
+    name: nightly-32
+    type: exe
+  - path: cperl-$(appveyor_build_version)-win64.exe
+    name: nightly-64
+    type: exe
+  - path: $(APPVEYOR_REPO_TAG_NAME)-win32.exe
+    name: tagged-32
+    type: exe
+  - path: $(APPVEYOR_REPO_TAG_NAME)-win64.exe
+    name: tagged-64
     type: exe
 
 deploy:
-  release: $(APPVEYOR_REPO_TAG_NAME)
-  description: 'cperl windows sfx'
-  provider: GitHub
+- provider: GitHub
+  tag: cperl-win-$(appveyor_build_version)
+  description: 'cperl windows sfx nightly'
+  auth_token:
+    secure: AsIAOIgCJX0QhrUKal2V00aaB5nRWtmtFTFeDVsGnbJLeEQpv9avUp0HT1cA8bNs
+  artifact: nightly-32,nightly-64
+  draft: true
+  prerelease: true
+  force_update: true
+  on:
+    branch: /(master|relprep|cperl-tag-deploy-test)/
+    MSVC_VERSION: 12
+- provider: GitHub
+  tag: $(APPVEYOR_REPO_TAG_NAME)-win
+  description: 'cperl windows sfx tagged'
   auth_token:
-    secure: "zWVKDFnHOuiPTPwo4/BAzTmn/4TPb4MqkmBYaOpom7L46StKDYA8j81hcdsjnAqZUDKEOTY54ASXV/LqaaVn19bggqT8pZg04/uAv1Ci9bOYKKBsD1W/4kws+1o4IdIVO4m6uSlapSFZPExMl/+BNwoiPuJc6Xbfyuh86p5MQ7nqjYxycLXybDrvLtwSGm8XghxGK3/93q8/LF+BVe+ZsaCrozj8Nd0nnzzzuwxGi+VJPhbDp5BH8p06n7eCv5AMR9p1urNQ3XyrdO9GGDuRNzJf6TZHvYJXl0aM8HRklgdMZl2/FQgcRznk9PZFw5n/NttqZvLKh8mTDqfcXAv3JRHZuzSnyY2netUD1/VmUd6TCCM+8zVp3/592tkr2A6tQfmZvFMLeLH5waVC/vRw3UpljEZ0I/3Jac3gE2T36UJmF+k5DWWWBfjGnvJ2S1MTre/nlBgB+gPXZ/XZOt+dBrjFts8Q3gUTgE2IPJUrkOaGKmj8mXcPL/mES6MPIdfJGKDTVd+XwzDD2TNa6D//Y6LcfBCuIF/gQm6ipSDpQLrm52MqXAWLjGpnjj+JKoSrOcoV4GgzzrA90AJr1SBEOttHNPcuZgRJ3krMYsjsYpNR164XBCcRDXYwQl80JpHdC2bAn7Bnv59etJdF+LETxedvGsPfbRU2u9DhoCqegEU="
-  artifact: cperl-$(APPVEYOR_REPO_TAG_NAME)-win$(PLATFORM).exe
-  draft: false
-  prerelease: false
+    secure: AsIAOIgCJX0QhrUKal2V00aaB5nRWtmtFTFeDVsGnbJLeEQpv9avUp0HT1cA8bNs
+  artifact: tagged-32,tagged-64
+  draft: true
+  force_update: true
   on:
     appveyor_repo_tag: true
+    MSVC_VERSION: 12
 
 notifications:
 - provider: Email

t/appveyor-smoke.bat

@@ -3,24 +3,64 @@
 if not "%PLATFORM%" == "x64" set WIN64=undef
 if "%MSVC_VERSION%" == "10" goto msvc_10
 if "%MSVC_VERSION%" == "12" goto msvc_12
+if "%MSVC_VERSION%" == "14" goto msvc_14
 
 :msvc_12
 if "%PLATFORM%" == "x64" set PLATFORM=amd64
 call "C:\Program Files (x86)\Microsoft Visual Studio %MSVC_VERSION%.0\VC\vcvarsall.bat" %PLATFORM%
 rem Env var PLATFORM changes, the X is really capitalized.
 rem Trim PATH to the minimum to build cperl less IO and CPU by not searching
 rem many dozens of dirs when loading DLLs and starting processes.
-if "%PLATFORM%" == "X64" ( set "PATH=C:\windows\system32;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\BIN\amd64;C:\Program Files (x86)\Windows Kits\8.1\bin\x64;C:\Program Files (x86)\Windows Kits\8.1\bin\x86;C:\windows;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin" ) ELSE ( set "PATH=C:\windows\system32;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\BIN;C:\Program Files (x86)\Windows Kits\8.1\bin\x86;C:\windows;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin" )
+if "%PLATFORM%" == "X64" ( set "PATH=C:\windows\system32;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\BIN\amd64;C:\Program Files (x86)\Windows Kits\8.1\bin\x64;C:\Program Files (x86)\Windows Kits\8.1\bin\x86;C:\windows;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Program Files\7-Zip;" ) ELSE ( set "PATH=C:\windows\system32;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\BIN;C:\Program Files (x86)\Windows Kits\8.1\bin\x86;C:\windows;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\7-Zip;" )
 
 cd win32
 rem if "%PLATFORM%" == "X64" exit /b
 rem if "%PLATFORM%" == "x86" set PERL_ENCODE_DEBUG=1
-nmake test CCTYPE=MSVC120 USE_NO_REGISTRY=define || exit /b
+
+rem nmake test CCTYPE=MSVC120 USE_NO_REGISTRY=define || exit /b
+
+rem install on master/relprep/tag
+if "%APPVEYOR_REPO_TAG%" == "true" goto tag
+if "%APPVEYOR_REPO_BRANCH%" == "master" goto nightly
+if "%APPVEYOR_REPO_BRANCH%" == "smoke/relprep" goto nightly
+if "%APPVEYOR_REPO_BRANCH%" == "cperl-tag-deploy-test" goto nightly
+exit /b
+
+:nightly
+nmake install CCTYPE=MSVC120 USE_NO_REGISTRY=undef
+cd ..
+set BITS=64
+if %PLATFORM% == x86 set BITS=32
+7z a -y -sfx cperl-%APPVEYOR_BUILD_VERSION%-win%BITS%.exe c:\cperl\
+del /s /f /q C:\cperl
+exit /b
+
+:tag
+nmake install CCTYPE=MSVC120 USE_NO_REGISTRY=undef
+cd ..
+set BITS=64
+if %PLATFORM% == x86 set BITS=32
+7z a -y -sfx %APPVEYOR_REPO_TAG_NAME%-win%BITS%.exe c:\cperl\
+del /s /f /q C:\cperl
 exit /b
 
 :msvc_10
+exit /b
+
 call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /%PLATFORM%
-if "%PLATFORM%" == "x64" ( set "PATH=C:\windows\system32;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\Bin\amd64;C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\x64;C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin;C:\windows;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin" ) ELSE ( set "PATH=C:\windows\system32;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\Bin;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE;C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin;C:\windows;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin" )
+if "%PLATFORM%" == "x64" ( set "PATH=C:\windows\system32;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\Bin\amd64;C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\x64;C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin;C:\windows;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Program Files\7-Zip;" ) ELSE ( set "PATH=C:\windows\system32;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\Bin;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE;C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin;C:\windows;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\7-Zip;" )
+
+cd win32
+rem if "%PLATFORM%" == "x64" exit /b
+rem if "%PLATFORM%" == "x86" set PERL_ENCODE_DEBUG=1
+nmake test CCTYPE=MSVC100 USE_NO_REGISTRY=define || exit /b
+exit /b
+
+:msvc_14
+if "%PLATFORM%" == "x64" set PLATFORM=amd64
+call "C:\Program Files (x86)\Microsoft Visual Studio %MSVC_VERSION%.0\VC\vcvarsall.bat" %PLATFORM%
+set
+if "%PLATFORM%" == "X64" ( set "PATH=C:\windows\system32;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\BIN\amd64;C:\Program Files (x86)\Windows Kits\8.1\bin\x64;C:\Program Files (x86)\Windows Kits\8.1\bin\x86;C:\windows;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Program Files\7-Zip;" ) ELSE ( set "PATH=C:\windows\system32;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\BIN;C:\Program Files (x86)\Windows Kits\8.1\bin\x86;C:\windows;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\7-Zip;" )
 
 cd win32
 rem if "%PLATFORM%" == "x64" exit /b