Skip to content

Commit

Permalink
Azure (#174)
Browse files Browse the repository at this point in the history
* switch to azure pipelines

no more jenkins, do mac builds on azure

* add status badge

* fix manifest issue

* full path to tox on windows

* quotes

* indentation

* i don't understand.

* remove unneeded vars

* test on more pythons
  • Loading branch information
reaperhulk authored and alex committed May 26, 2019
1 parent bc8a55e commit 6659f21
Show file tree
Hide file tree
Showing 5 changed files with 93 additions and 66 deletions.
8 changes: 0 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,6 @@ matrix:
- env: TOXENV=packaging
- python: 3.5
env: TOXENV=py3pep8
- language: generic
os: osx
osx_image: xcode9.4
env: TOXENV=py27
- language: generic
os: osx
osx_image: xcode9.4
env: TOXENV=py35

install: .travis/install.sh

Expand Down
57 changes: 0 additions & 57 deletions Jenkinsfile

This file was deleted.

2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ include src/build_bcrypt.py
recursive-include src/_csrc *
recursive-include tests *.py

exclude requirements.txt tasks.py .travis.yml wheel-scripts Jenkinsfile
exclude requirements.txt tasks.py .travis.yml wheel-scripts Jenkinsfile azure-pipelines.yml

exclude .jenkins
recursive-exclude .jenkins *
Expand Down
3 changes: 3 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ bcrypt
.. image:: https://travis-ci.org/pyca/bcrypt.svg?branch=master
:target: https://travis-ci.org/pyca/bcrypt

.. image:: https://dev.azure.com/pyca/bcrypt/_apis/build/status/bcrypt-CI?branchName=master
:target: https://dev.azure.com/pyca/bcrypt/_build/latest?definitionId=8&branchName=master

Good password hashing for your software and your servers


Expand Down
89 changes: 89 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
trigger:
branches:
include:
- "master"
tags:
include:
- "*"

jobs:
- job: 'mac'
pool:
vmImage: 'macOS-10.14'
strategy:
matrix:
Python27:
python.version: '2.7'
TOXENV: py27
Python34:
python.version: '3.4'
TOXENV: py34
Python35:
python.version: '3.5'
TOXENV: py35
Python36:
python.version: '3.6'
TOXENV: py36
Python37:
python.version: '3.7'
TOXENV: py37
steps:
- task: UsePythonVersion@0
inputs:
versionSpec: '$(python.version)'
architecture: 'x64'

- script: pip install tox
displayName: 'Install tox'

- script: tox
displayName: 'Run tests'
- job: 'win'
pool:
vmImage: 'windows-2019'
container: $[variables.containerImage]
strategy:
matrix:
Python27-x86:
TOXENV: py27
containerImage: 'pyca/cryptography-runner-windows:py27-x86'
PYTHON_DIR: 'Python27'
Python27-x86-64:
TOXENV: py27
containerImage: 'pyca/cryptography-runner-windows:py27-x86_64'
PYTHON_DIR: 'Python27'
Python34-x86:
TOXENV: py34
containerImage: 'pyca/cryptography-runner-windows:py34-x86'
PYTHON_DIR: 'Python34'
Python34-x86-64:
TOXENV: py34
containerImage: 'pyca/cryptography-runner-windows:py34-x86_64'
PYTHON_DIR: 'Python34'
Python35-x86:
TOXENV: py35
containerImage: 'pyca/cryptography-runner-windows:py35-x86'
PYTHON_DIR: 'Python35'
Python35-x86-64:
TOXENV: py35
containerImage: 'pyca/cryptography-runner-windows:py35-x86_64'
PYTHON_DIR: 'Python35'
Python36-x86:
TOXENV: py36
containerImage: 'pyca/cryptography-runner-windows:py3-x86'
PYTHON_DIR: 'Python36'
Python36-x86-64:
TOXENV: py36
containerImage: 'pyca/cryptography-runner-windows:py3-x86_64'
PYTHON_DIR: 'Python36'
Python37-x86:
TOXENV: py37
containerImage: 'pyca/cryptography-runner-windows:py3-x86'
PYTHON_DIR: 'Python37'
Python37-x86-64:
TOXENV: py37
containerImage: 'pyca/cryptography-runner-windows:py3-x86_64'
PYTHON_DIR: 'Python37'
steps:
- script: "C:/%PYTHON_DIR%/Scripts/tox"
displayName: 'Run tests'

0 comments on commit 6659f21

Please sign in to comment.