From 9aa4525afd85dc1617c1d503dc52b3614ceb80c1 Mon Sep 17 00:00:00 2001 From: Thomas Ferreira de Lima Date: Wed, 3 Apr 2019 19:03:46 -0400 Subject: [PATCH 1/8] Configuring .travis.yml to reduce build frequency Python modules will only be built on tagged commits of the format: v0.25(.8)(-dev14) MacOS builds will only be built on staging branch All will be built on pull requests. --- .travis.yml | 169 ++++++++++++++++++++++++---------------------------- 1 file changed, 78 insertions(+), 91 deletions(-) diff --git a/.travis.yml b/.travis.yml index 40201f5e0..0d63ba176 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,9 @@ matrix: # python manylinux packages - name: "cp37-cp37m-manylinux1_x86_64.whl" + branches: + only: + - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: linux sudo: true language: python @@ -20,6 +23,9 @@ matrix: - ccache - name: "cp37-cp37m-manylinux1_i686.whl" + branches: + only: + - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: linux sudo: true services: @@ -34,6 +40,9 @@ matrix: - ccache - name: "cp36-cp36m-manylinux1_x86_64.whl" + branches: + only: + - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: linux sudo: true language: python @@ -51,6 +60,9 @@ matrix: - ccache - name: "cp36-cp36m-manylinux1_i686.whl" + branches: + only: + - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: linux sudo: true services: @@ -65,6 +77,9 @@ matrix: - ccache - name: "cp35-cp35m-manylinux1_x86_64.whl" + branches: + only: + - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: linux sudo: true language: python @@ -82,6 +97,9 @@ matrix: - ccache - name: "cp35-cp35m-manylinux1_i686.whl" + branches: + only: + - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: linux sudo: true services: @@ -96,6 +114,9 @@ matrix: - ccache - name: "cp34-cp34m-manylinux1_x86_64.whl" + branches: + only: + - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: linux sudo: true language: python @@ -113,6 +134,9 @@ matrix: - ccache - name: "cp34-cp34m-manylinux1_i686.whl" + branches: + only: + - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: linux sudo: true services: @@ -127,6 +151,9 @@ matrix: - ccache - name: "cp27-cp27mu-manylinux1_x86_64.whl" + branches: + only: + - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: linux sudo: true language: python @@ -144,6 +171,9 @@ matrix: - ccache - name: "cp27-cp27mu-manylinux1_i686.whl" + branches: + only: + - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: linux sudo: true services: @@ -158,6 +188,9 @@ matrix: - ccache - name: "cp27-cp27m-manylinux1_x86_64.whl" + branches: + only: + - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: linux sudo: true language: python @@ -175,6 +208,9 @@ matrix: - ccache - name: "cp27-cp27m-manylinux1_i686.whl" + branches: + only: + - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: linux sudo: true services: @@ -193,6 +229,9 @@ matrix: # - name: "klayout python2 osx10.13" - name: "cp27-cp27m-macosx_10_13_x86_64.whl" + branches: + only: + - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: osx osx_image: xcode9.4 # macOS 10.13 cache: ccache @@ -208,6 +247,9 @@ matrix: # - name: "klayout python2 osx10.12" - name: "cp27-cp27m-macosx_10_12_x86_64.whl" + branches: + only: + - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: osx osx_image: xcode8.3 # macOS 10.12 cache: ccache @@ -223,6 +265,9 @@ matrix: # - name: "klayout python2 osx10.11" - name: "cp27-cp27m-macosx_10_11_x86_64.whl" + branches: + only: + - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: osx osx_image: xcode8 # macOS 10.11 cache: ccache @@ -240,6 +285,9 @@ matrix: # - name: "klayout python3 osx10.13" - name: "cp37-cp37m-macosx_10_13_x86_64.whl" + branches: + only: + - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: osx osx_image: xcode9.4 # macOS 10.13 cache: ccache @@ -257,6 +305,9 @@ matrix: # - name: "klayout python3.6.6 osx10.13" - name: "cp36-cp36m-macosx_10_13_x86_64.whl" + branches: + only: + - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: osx osx_image: xcode9.4 # macOS 10.13 cache: ccache @@ -272,6 +323,9 @@ matrix: # - name: "klayout python3.5.6 osx10.13" - name: "cp35-cp35m-macosx_10_13_x86_64.whl" + branches: + only: + - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: osx osx_image: xcode9.4 # macOS 10.13 cache: ccache @@ -302,6 +356,9 @@ matrix: # - name: "klayout python3 osx10.12" - name: "cp37-cp37m-macosx_10_12_x86_64.whl" + branches: + only: + - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: osx osx_image: xcode8.3 # macOS 10.12 cache: ccache @@ -319,6 +376,9 @@ matrix: # - name: "klayout python3 osx10.11" - name: "cp37-cp37m-macosx_10_11_x86_64.whl" + branches: + only: + - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: osx osx_image: xcode8 # macOS 10.11 cache: ccache @@ -331,101 +391,13 @@ matrix: - ARCHFLAGS="-std=c++11" - PIP_UPDATE="1" - PYTHON_BUILD=true - - # - name: "klayout python3.7 package" - # os: linux - # dist: trusty # Ubuntu 14.04 - # sudo: false - # language: python - # python: '3.7-dev' - # env: - # - MATRIX_EVAL="" - # - PIP_UPDATE="1" - # - PYTHON_BUILD=true - # - CC=clang - # - CXX=clang++ - - # - name: "klayout python3.6 package" - # os: linux - # dist: trusty # Ubuntu 14.04 - # sudo: false - # language: python - # python: '3.6' - # env: - # - MATRIX_EVAL="" - # - PIP_UPDATE="1" - # - PYTHON_BUILD=true - # - CC=clang - # - CXX=clang++ - - # - name: "klayout python2.7 package" - # os: linux - # dist: trusty # Ubuntu 14.04 - # sudo: false - # language: python - # python: '2.7' - # env: - # - MATRIX_EVAL="" - # - PIP_UPDATE="1" - # - PYTHON_BUILD=true - # - CC=clang - # - CXX=clang++ - - # - name: "klayout python2.6 package" - # os: linux - # dist: trusty # Ubuntu 14.04 - # sudo: false - # language: python - # python: '2.6' - # env: - # - MATRIX_EVAL="" - # - PIP_UPDATE="0" # setuptools installed from last pip has syntax error on py 2.6 - # - PYTHON_BUILD=true - # - CC=clang - # - CXX=clang++ - - # - name: "klayout python3.3 package" - # os: linux - # dist: trusty # Ubuntu 14.04 - # sudo: false - # language: python - # python: '3.3' - # env: - # - MATRIX_EVAL="" - # - PIP_UPDATE="1" - # - PYTHON_BUILD=true - # - CC=clang - # - CXX=clang++ - - # - name: "klayout python3.4 package" - # os: linux - # dist: trusty # Ubuntu 14.04 - # sudo: false - # language: python - # python: '3.4' - # env: - # - MATRIX_EVAL="" - # - PIP_UPDATE="1" - # - PYTHON_BUILD=true - # - CC=clang - # - CXX=clang++ - - # - name: "klayout python3.5 package" - # os: linux - # dist: trusty # Ubuntu 14.04 - # sudo: false - # language: python - # python: '3.5' - # env: - # - MATRIX_EVAL="" - # - PIP_UPDATE="1" - # - PYTHON_BUILD=true - # - CC=clang - # - CXX=clang++ # KLayout builds for mac # Python 3 - name: "KLayout macOS 10.13 with py3.7" + branches: + only: + - staging os: osx osx_image: xcode9.4 # macOS 10.13 cache: ccache @@ -443,6 +415,9 @@ matrix: - KLAYOUT_BUILD=true - name: "KLayout macOS 10.12 with py3.7" + branches: + only: + - staging os: osx osx_image: xcode8.3 # macOS 10.12 cache: ccache @@ -460,6 +435,9 @@ matrix: - KLAYOUT_BUILD=true - name: "KLayout macOS 10.11 with py3.7" + branches: + only: + - staging os: osx osx_image: xcode8 # macOS 10.11 cache: ccache @@ -476,6 +454,9 @@ matrix: # Python 2 - name: "KLayout macOS 10.13 with py2.7" + branches: + only: + - staging os: osx osx_image: xcode9.4 # macOS 10.13 cache: ccache @@ -492,6 +473,9 @@ matrix: - KLAYOUT_BUILD=true - name: "KLayout macOS 10.12 with py2.7" + branches: + only: + - staging os: osx osx_image: xcode8.3 # macOS 10.12 cache: ccache @@ -508,6 +492,9 @@ matrix: - KLAYOUT_BUILD=true - name: "KLayout macOS 10.11 with py2.7" + branches: + only: + - staging os: osx osx_image: xcode8 # macOS 10.11 cache: ccache From 4df1dc7c03abc03a1e74f1c06287b3d26e4b3d15 Mon Sep 17 00:00:00 2001 From: Thomas Ferreira de Lima Date: Wed, 3 Apr 2019 19:30:47 -0400 Subject: [PATCH 2/8] Only building in azure for PR and tagged commits --- azure-pipelines.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e35efce39..d3340c460 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,4 +1,9 @@ # https://aka.ms/yaml +trigger: + tags: + include: + - v* + jobs: - job: Build pool: From 3bfd177fcf0bf4176b7547d39bc19e394f2116df Mon Sep 17 00:00:00 2001 From: Thomas Ferreira de Lima Date: Wed, 3 Apr 2019 20:06:31 -0400 Subject: [PATCH 3/8] Fixing travis condition --- .travis.yml | 91 +++++++---------------------------------------------- 1 file changed, 12 insertions(+), 79 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0d63ba176..09802c114 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,13 @@ +branches: + only: + - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) + - staging + matrix: include: # python manylinux packages - name: "cp37-cp37m-manylinux1_x86_64.whl" - branches: - only: - - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: linux sudo: true language: python @@ -23,9 +25,6 @@ matrix: - ccache - name: "cp37-cp37m-manylinux1_i686.whl" - branches: - only: - - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: linux sudo: true services: @@ -40,9 +39,6 @@ matrix: - ccache - name: "cp36-cp36m-manylinux1_x86_64.whl" - branches: - only: - - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: linux sudo: true language: python @@ -60,9 +56,6 @@ matrix: - ccache - name: "cp36-cp36m-manylinux1_i686.whl" - branches: - only: - - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: linux sudo: true services: @@ -77,9 +70,6 @@ matrix: - ccache - name: "cp35-cp35m-manylinux1_x86_64.whl" - branches: - only: - - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: linux sudo: true language: python @@ -97,9 +87,6 @@ matrix: - ccache - name: "cp35-cp35m-manylinux1_i686.whl" - branches: - only: - - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: linux sudo: true services: @@ -114,9 +101,6 @@ matrix: - ccache - name: "cp34-cp34m-manylinux1_x86_64.whl" - branches: - only: - - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: linux sudo: true language: python @@ -134,9 +118,6 @@ matrix: - ccache - name: "cp34-cp34m-manylinux1_i686.whl" - branches: - only: - - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: linux sudo: true services: @@ -151,9 +132,6 @@ matrix: - ccache - name: "cp27-cp27mu-manylinux1_x86_64.whl" - branches: - only: - - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: linux sudo: true language: python @@ -171,9 +149,6 @@ matrix: - ccache - name: "cp27-cp27mu-manylinux1_i686.whl" - branches: - only: - - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: linux sudo: true services: @@ -188,9 +163,6 @@ matrix: - ccache - name: "cp27-cp27m-manylinux1_x86_64.whl" - branches: - only: - - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: linux sudo: true language: python @@ -208,9 +180,6 @@ matrix: - ccache - name: "cp27-cp27m-manylinux1_i686.whl" - branches: - only: - - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: linux sudo: true services: @@ -229,9 +198,6 @@ matrix: # - name: "klayout python2 osx10.13" - name: "cp27-cp27m-macosx_10_13_x86_64.whl" - branches: - only: - - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: osx osx_image: xcode9.4 # macOS 10.13 cache: ccache @@ -247,9 +213,6 @@ matrix: # - name: "klayout python2 osx10.12" - name: "cp27-cp27m-macosx_10_12_x86_64.whl" - branches: - only: - - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: osx osx_image: xcode8.3 # macOS 10.12 cache: ccache @@ -265,9 +228,6 @@ matrix: # - name: "klayout python2 osx10.11" - name: "cp27-cp27m-macosx_10_11_x86_64.whl" - branches: - only: - - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: osx osx_image: xcode8 # macOS 10.11 cache: ccache @@ -285,9 +245,6 @@ matrix: # - name: "klayout python3 osx10.13" - name: "cp37-cp37m-macosx_10_13_x86_64.whl" - branches: - only: - - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: osx osx_image: xcode9.4 # macOS 10.13 cache: ccache @@ -305,9 +262,6 @@ matrix: # - name: "klayout python3.6.6 osx10.13" - name: "cp36-cp36m-macosx_10_13_x86_64.whl" - branches: - only: - - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: osx osx_image: xcode9.4 # macOS 10.13 cache: ccache @@ -323,9 +277,6 @@ matrix: # - name: "klayout python3.5.6 osx10.13" - name: "cp35-cp35m-macosx_10_13_x86_64.whl" - branches: - only: - - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: osx osx_image: xcode9.4 # macOS 10.13 cache: ccache @@ -356,9 +307,6 @@ matrix: # - name: "klayout python3 osx10.12" - name: "cp37-cp37m-macosx_10_12_x86_64.whl" - branches: - only: - - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: osx osx_image: xcode8.3 # macOS 10.12 cache: ccache @@ -376,9 +324,6 @@ matrix: # - name: "klayout python3 osx10.11" - name: "cp37-cp37m-macosx_10_11_x86_64.whl" - branches: - only: - - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) os: osx osx_image: xcode8 # macOS 10.11 cache: ccache @@ -395,9 +340,7 @@ matrix: # KLayout builds for mac # Python 3 - name: "KLayout macOS 10.13 with py3.7" - branches: - only: - - staging + if: branch = staging OR branch = master os: osx osx_image: xcode9.4 # macOS 10.13 cache: ccache @@ -415,9 +358,7 @@ matrix: - KLAYOUT_BUILD=true - name: "KLayout macOS 10.12 with py3.7" - branches: - only: - - staging + if: branch = staging OR branch = master os: osx osx_image: xcode8.3 # macOS 10.12 cache: ccache @@ -435,9 +376,7 @@ matrix: - KLAYOUT_BUILD=true - name: "KLayout macOS 10.11 with py3.7" - branches: - only: - - staging + if: branch = staging OR branch = master os: osx osx_image: xcode8 # macOS 10.11 cache: ccache @@ -454,9 +393,7 @@ matrix: # Python 2 - name: "KLayout macOS 10.13 with py2.7" - branches: - only: - - staging + if: branch = staging OR branch = master os: osx osx_image: xcode9.4 # macOS 10.13 cache: ccache @@ -473,9 +410,7 @@ matrix: - KLAYOUT_BUILD=true - name: "KLayout macOS 10.12 with py2.7" - branches: - only: - - staging + if: branch = staging OR branch = master os: osx osx_image: xcode8.3 # macOS 10.12 cache: ccache @@ -492,9 +427,7 @@ matrix: - KLAYOUT_BUILD=true - name: "KLayout macOS 10.11 with py2.7" - branches: - only: - - staging + if: branch = staging OR branch = master os: osx osx_image: xcode8 # macOS 10.11 cache: ccache @@ -571,7 +504,7 @@ after_success: # uploading to pypi using twine # need TWINE_USERNAME, TWINE_PASSWORD and TWINE_REPOSITORY_URL env variable - - if [ "$PYTHON_BUILD" = true ] || [ "$DOCKER_BUILD" = true ]; then + - if [ ! -z "$TRAVIS_TAG" ] && [ ! -z "$TWINE_PASSWORD" ] && [[ "$PYTHON_BUILD" = true || "$DOCKER_BUILD" = true ]]; then pip install -U twine || sudo pip install -U twine; twine upload --skip-existing deploy/dist-pymod/$klayout_version/*; fi From 482184c9360ff39273708edf998a8742741642da Mon Sep 17 00:00:00 2001 From: Thomas Ferreira de Lima Date: Wed, 3 Apr 2019 20:16:44 -0400 Subject: [PATCH 4/8] Allowing build on push to master --- .travis.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 09802c114..df7f52efd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ branches: only: - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) - staging + - master matrix: include: @@ -340,7 +341,6 @@ matrix: # KLayout builds for mac # Python 3 - name: "KLayout macOS 10.13 with py3.7" - if: branch = staging OR branch = master os: osx osx_image: xcode9.4 # macOS 10.13 cache: ccache @@ -358,7 +358,6 @@ matrix: - KLAYOUT_BUILD=true - name: "KLayout macOS 10.12 with py3.7" - if: branch = staging OR branch = master os: osx osx_image: xcode8.3 # macOS 10.12 cache: ccache @@ -376,7 +375,6 @@ matrix: - KLAYOUT_BUILD=true - name: "KLayout macOS 10.11 with py3.7" - if: branch = staging OR branch = master os: osx osx_image: xcode8 # macOS 10.11 cache: ccache @@ -393,7 +391,6 @@ matrix: # Python 2 - name: "KLayout macOS 10.13 with py2.7" - if: branch = staging OR branch = master os: osx osx_image: xcode9.4 # macOS 10.13 cache: ccache @@ -410,7 +407,6 @@ matrix: - KLAYOUT_BUILD=true - name: "KLayout macOS 10.12 with py2.7" - if: branch = staging OR branch = master os: osx osx_image: xcode8.3 # macOS 10.12 cache: ccache @@ -427,7 +423,6 @@ matrix: - KLAYOUT_BUILD=true - name: "KLayout macOS 10.11 with py2.7" - if: branch = staging OR branch = master os: osx osx_image: xcode8 # macOS 10.11 cache: ccache From 1c56f3e3a48998e487b3e6328063ccea8e31f966 Mon Sep 17 00:00:00 2001 From: Thomas Ferreira de Lima Date: Wed, 3 Apr 2019 20:19:20 -0400 Subject: [PATCH 5/8] Matching azure with travis --- azure-pipelines.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d3340c460..558d068ad 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,7 +2,11 @@ trigger: tags: include: - - v* + - '*' + branches: + include: + - master + - staging jobs: - job: Build From 2c3e04b65293fefb9487ba42cbf026e48ef256e6 Mon Sep 17 00:00:00 2001 From: Thomas Ferreira de Lima Date: Wed, 3 Apr 2019 20:27:38 -0400 Subject: [PATCH 6/8] Azure: do not deploy to pypi unless tagged --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 558d068ad..0ccc45d0c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -166,4 +166,5 @@ jobs: TWINE_PASSWORD: $(TWINE_PASSWORD) TWINE_REPOSITORY_URL: $(TWINE_REPOSITORY_URL) displayName: 'Uploading to PyPI' + condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/') From d980c6f78477755c90d45529747e06dbb462f710 Mon Sep 17 00:00:00 2001 From: Thomas Ferreira de Lima Date: Thu, 4 Apr 2019 14:29:22 -0400 Subject: [PATCH 7/8] Triggering Azure while on master or staging --- azure-pipelines.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 12fbfee94..bad5ea503 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,8 +1,5 @@ # https://aka.ms/yaml trigger: - tags: - include: - - '*' branches: include: - master From e68047733f255ba897fc75c7b3aa8974d498fffa Mon Sep 17 00:00:00 2001 From: Thomas Ferreira de Lima Date: Thu, 4 Apr 2019 14:33:57 -0400 Subject: [PATCH 8/8] pymod 0.26.0.dev15 - included basic.lib --- .travis.yml | 2 +- azure-pipelines.yml | 3 +++ setup.py | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index dd0d4100a..a2c94dda9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ branches: only: - - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tag format: v0.25(.8)(-dev14) + - /v\d+\.\d+(\.\d+)?(\S*)?$/ # tag format: *v0.25(.8)(dev14) - staging - master diff --git a/azure-pipelines.yml b/azure-pipelines.yml index bad5ea503..8ca89537b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,6 +4,9 @@ trigger: include: - master - staging + tags: + include: + - '*' jobs: - job: Build diff --git a/setup.py b/setup.py index bee480c5d..b3f6be9e8 100644 --- a/setup.py +++ b/setup.py @@ -326,7 +326,7 @@ class Config(object): """ Gets the version string """ - return "0.26.0.dev14" + return "0.26.0.dev15" config = Config()