From c0e65c18e0a7f2d33e664695a24feda901ee8f14 Mon Sep 17 00:00:00 2001 From: xufan6 Date: Sun, 30 Aug 2020 18:42:55 -0700 Subject: [PATCH 1/5] add ubuntu ca-cert file to single file lib. --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2c79061..29aa13d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,8 @@ install: # 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 +43,4 @@ deploy: on: tags: true branch: master - python: '3.7' \ No newline at end of file + python: '3.7' From a5f06e04c401ed18b0e82d16bad6632f8cfc13a1 Mon Sep 17 00:00:00 2001 From: xufan6 Date: Tue, 1 Sep 2020 00:35:39 -0700 Subject: [PATCH 2/5] set pyinstaller==3.6 in .travis.yml, for python 2.7 env --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 29aa13d..05ec150 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ dist: xenial # command to install dependencies install: - - pip install pyinstaller + - pip install pyinstaller==3.6 # command to run tests script: From 8b225947c85c50df86f3c1c9f40b040958b5bc4f Mon Sep 17 00:00:00 2001 From: xufan6 Date: Tue, 1 Sep 2020 00:47:00 -0700 Subject: [PATCH 3/5] set pyinstaller==3.6 in azure-pipelines.yml, for python 2.7 env --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8811cde..8ec42ac 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -44,7 +44,7 @@ jobs: - script: python -m pip install --upgrade pip displayName: 'Install dependencies' - - script: pip install pyinstaller + - script: pip install pyinstaller==3.6 name: 'pyinstaller' - bash: sed -i -e "s/\${BUILD_SOURCEBRANCHNAME}/${BUILD_SOURCEBRANCHNAME}/" -e "s/\${BUILD_DATE}/$(date --iso-8601=seconds)/" run.py @@ -87,7 +87,7 @@ jobs: - script: python -m pip install --upgrade pip displayName: 'Install dependencies' - - script: pip install pyinstaller + - script: pip install pyinstaller==3.6 name: 'pyinstaller' - bash: sed -i.temp -e "s/\${BUILD_SOURCEBRANCHNAME}/${BUILD_SOURCEBRANCHNAME}/" -e "s/\${BUILD_DATE}/$(date --iso-8601=seconds)/" run.py From 9c830962aa001cb4b45ddb1392e09a81f48f162f Mon Sep 17 00:00:00 2001 From: xufan6 Date: Mon, 7 Sep 2020 01:26:43 -0700 Subject: [PATCH 4/5] specific version for pyinstaller only in py2.7 --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 05ec150..71ed414 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,10 +9,12 @@ 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==3.6 + - pip install ${PYINSTALLER} # command to run tests script: From bc6f7feb7778d54a537b487e4d40795872e7ee7b Mon Sep 17 00:00:00 2001 From: xufan6 Date: Mon, 7 Sep 2020 01:33:13 -0700 Subject: [PATCH 5/5] specific version for pyinstaller only in py2.7 azure-pipelines.yml --- azure-pipelines.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8ec42ac..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==3.6 + - 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==3.6 + - 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