diff --git a/.travis.yml b/.travis.yml index 2c79061..71ed414 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,14 +9,18 @@ dist: xenial # - linux # - osx +before_install: + - if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then export PYINSTALLER='pyinstaller==3.6';else export PYINSTALLER=pyinstaller;fi # command to install dependencies install: - - pip install pyinstaller + - pip install ${PYINSTALLER} # command to run tests script: - sed -i -e "s/\${BUILD_SOURCEBRANCHNAME}/${TRAVIS_BRANCH}/" -e "s/\${BUILD_DATE}/$(date --iso-8601=seconds)/" run.py + - cp /etc/ssl/certs/ca-certificates.crt cert.pem + - export SSL_CERT_FILE=${PWD}/cert.pem - pyinstaller --onefile --noconfirm --clean ./.build/ddns.spec - ./dist/ddns || test -e "config.json" @@ -41,4 +45,4 @@ deploy: on: tags: true branch: master - python: '3.7' \ No newline at end of file + python: '3.7' diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8811cde..ef0b16d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -31,8 +31,10 @@ jobs: matrix: Python27: python.version: '2.7' + pyinstaller.version: 'pyinstaller==3.6' Python37: python.version: '3.7' + pyinstaller.version: 'pyinstaller' maxParallel: 4 steps: @@ -44,7 +46,7 @@ jobs: - script: python -m pip install --upgrade pip displayName: 'Install dependencies' - - script: pip install pyinstaller + - script: pip install $(pyinstaller.version) name: 'pyinstaller' - bash: sed -i -e "s/\${BUILD_SOURCEBRANCHNAME}/${BUILD_SOURCEBRANCHNAME}/" -e "s/\${BUILD_DATE}/$(date --iso-8601=seconds)/" run.py @@ -74,8 +76,10 @@ jobs: matrix: Python27: python.version: '2.7' + pyinstaller.version: 'pyinstaller==3.6' Python37: python.version: '3.7' + pyinstaller.version: 'pyinstaller' maxParallel: 4 steps: @@ -87,7 +91,7 @@ jobs: - script: python -m pip install --upgrade pip displayName: 'Install dependencies' - - script: pip install pyinstaller + - script: pip install $(pyinstaller.version) name: 'pyinstaller' - bash: sed -i.temp -e "s/\${BUILD_SOURCEBRANCHNAME}/${BUILD_SOURCEBRANCHNAME}/" -e "s/\${BUILD_DATE}/$(date --iso-8601=seconds)/" run.py