Fix appveyor conda-builds

Author: PMeira

.travis.yml

@@ -11,6 +11,8 @@ matrix:
       install:
         - docker pull $DOCKER_IMAGE
       script: 
+        - export TRAVIS_TAG_DSS_PYTHON=$TRAVIS_TAG
+        - export TRAVIS_TAG=
         - cd ..
         - mkdir artifacts
         - mkdir artifacts/linux-64
@@ -26,6 +28,8 @@ matrix:
     - name: "osx_x64"
       os: osx
       script: 
+        - export TRAVIS_TAG_DSS_PYTHON=$TRAVIS_TAG
+        - export TRAVIS_TAG=
         - git clone --branch 0.10.1 https://github.com/dss-extensions/electricdss-src ../electricdss-src
         - git clone --branch 0.10.1 https://github.com/dss-extensions/dss_capi ../dss_capi
         - bash ci/build_osx.sh

appveyor.yml

@@ -14,35 +14,6 @@ environment:
     - CONDA_SUBDIR: win-64
 
 build_script:
-- cmd: >-
-    rd /s /q c:\cygwin
-
-    git clone --branch 0.10.1 https://github.com/dss-extensions/electricdss-src ../electricdss-src
-
-    git clone --branch 0.10.1 https://github.com/dss-extensions/dss_capi ../dss_capi
-
-    set originalpath=%path%
-    
-    IF "%CONDA_SUBDIR%"=="win-32" SET MINICONDA_DIR=c:\miniconda3
-    
-    IF "%CONDA_SUBDIR%"=="win-64" SET MINICONDA_DIR=c:\miniconda3-x64
-    
-    set path=c:\cygwin64\bin;c:\cygwin64\usr\bin;c:\FPC\3.0.4\bin\i386-win32;c:\Program Files (x86)\Microsoft Visual Studio 14.0\vc\bin;%MINICONDA_DIR%;%MINICONDA_DIR%\scripts;%originalpath%
-
-    c:\cygwin64\bin\bash ci/build_windows.sh
-
-    set path=c:\FPC\3.0.4\bin\i386-win32;c:\Program Files (x86)\Microsoft Visual Studio 14.0\vc\bin;%MINICONDA_DIR%;%MINICONDA_DIR%\scripts;%originalpath%
-
-    %MINICONDA_DIR%\scripts\activate %MINICONDA_DIR%
-    
-    conda config --set always_yes yes
-    
-    IF DEFINED APPVEYOR_REPO_TAG_NAME conda-build --quiet --no-test --output-folder "c:\projects\artifacts" conda
-    
-    set path=c:\cygwin64\bin;c:\cygwin64\usr\bin;c:\FPC\3.0.4\bin\i386-win32;c:\Program Files (x86)\Microsoft Visual Studio 14.0\vc\bin;%MINICONDA_DIR%;%MINICONDA_DIR%\scripts;%originalpath%
-
-    c:\cygwin64\bin\bash ci/upload_windows.sh
-
-    dir ..\artifacts\*.whl ..\artifacts\*.tar.bz2 /s
+- cmd: call ci\build_appveyor.bat
 
 test: off

ci/build_appveyor.bat

@@ -0,0 +1,44 @@
+SETLOCAL ENABLEEXTENSIONS
+
+ren c:\cygwin cygwin.disabled
+
+IF DEFINED APPVEYOR_REPO_TAG_NAME set APPVEYOR_REPO_TAG_NAME_DSS_PYTHON=%APPVEYOR_REPO_TAG_NAME%
+set DSS_PYTHON_BUILD_TAG=0
+IF DEFINED APPVEYOR_REPO_TAG_NAME set DSS_PYTHON_BUILD_TAG=1
+
+set APPVEYOR_REPO_TAG_NAME=
+setx DSS_PYTHON_BUILD_TAG %DSS_PYTHON_BUILD_TAG%
+
+git clone --branch 0.10.1 https://github.com/dss-extensions/electricdss-src ../electricdss-src
+
+git clone --branch 0.10.1 https://github.com/dss-extensions/dss_capi ../dss_capi
+
+set originalpath=%path%
+
+IF "%CONDA_SUBDIR%"=="win-32" SET MINICONDA_DIR=c:\miniconda3
+
+IF "%CONDA_SUBDIR%"=="win-64" SET MINICONDA_DIR=c:\miniconda3-x64
+
+set path=c:\cygwin64\bin;c:\cygwin64\usr\bin;c:\FPC\3.0.4\bin\i386-win32;c:\Program Files (x86)\Microsoft Visual Studio 14.0\vc\bin;%MINICONDA_DIR%;%MINICONDA_DIR%\scripts;%originalpath%
+
+c:\cygwin64\bin\bash ci/build_windows.sh
+
+echo POST c:\cygwin64\bin\bash ci/build_windows.sh
+
+set path=c:\FPC\3.0.4\bin\i386-win32;c:\Program Files (x86)\Microsoft Visual Studio 14.0\vc\bin;%MINICONDA_DIR%;%MINICONDA_DIR%\scripts;%originalpath%
+
+call %MINICONDA_DIR%\scripts\activate %MINICONDA_DIR%
+
+echo POST ACTIVATE
+
+echo DSS_PYTHON_BUILD_TAG=%DSS_PYTHON_BUILD_TAG%
+
+IF "%DSS_PYTHON_BUILD_TAG%"=="1" conda-build --quiet --no-test --output-folder "c:\projects\artifacts" conda
+
+echo CONDA-BUILD CALLED 
+
+set path=c:\cygwin64\bin;c:\cygwin64\usr\bin;c:\FPC\3.0.4\bin\i386-win32;c:\Program Files (x86)\Microsoft Visual Studio 14.0\vc\bin;%MINICONDA_DIR%;%MINICONDA_DIR%\scripts;%originalpath%
+
+c:\cygwin64\bin\bash ci/upload_windows.sh
+
+dir ..\artifacts\*.whl ..\artifacts\*.tar.bz2 /s

ci/build_linux_conda.sh

@@ -1,4 +1,4 @@
-if [ -n "$TRAVIS_TAG" ]; then # only run conda-build on tags, takes too long
+if [ -n "$TRAVIS_TAG_DSS_PYTHON" ]; then # only run conda-build on tags, takes too long
     # Install Miniconda
     wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh -q
     bash miniconda.sh -b -p $HOME/miniconda

ci/build_osx.sh

@@ -50,7 +50,7 @@ for PYVERSION in 2.7 3.4 3.5 3.6 3.7; do
 done
 
 # Build conda packages
-if [ -n "$TRAVIS_TAG" ]; then  # only run conda-build on tags, takes too long
+if [ -n "$TRAVIS_TAG_DSS_PYTHON" ]; then  # only run conda-build on tags, takes too long
     conda-build --quiet --no-test --output-folder "$ARTIFACTS_FOLDER" conda 
 fi
 
@@ -64,7 +64,7 @@ fi
 # git checkout conda/meta.yaml
 
 # Upload artifacts to anaconda.org
-if [ -n "$TRAVIS_TAG" ]; then
+if [ -n "$TRAVIS_TAG_DSS_PYTHON" ]; then
     if [ -n "$ANACONDA_API_TOKEN" ]; then 
         find ../artifacts -name "*.whl" -or -name "*.tar.bz2" | xargs -I {} anaconda upload --no-progress -l main -u pmeira {}
     fi

ci/build_windows.sh

@@ -1,5 +1,7 @@
 set -e -x
 
+APPVEYOR_REPO_TAG_NAME=
+
 WGET=wget
 ln -s /cygdrive/c /c
 

ci/upload_windows.sh

@@ -1,4 +1,4 @@
-if [ -n "$APPVEYOR_REPO_TAG_NAME" ]; then
+if [ "$DSS_PYTHON_BUILD_TAG" == "1" ]; then
     if [ -n "$ANACONDA_API_TOKEN" ]; then 
         echo Upload artifacts to anaconda.org...
         find ../artifacts -name "*.whl" -or -name "*.tar.bz2" | xargs -I {} anaconda upload --no-progress -l main -u pmeira {}