Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Azure #174

Merged
merged 9 commits into from
May 26, 2019
Merged

Azure #174

Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
102 changes: 102 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
trigger:
branches:
include:
- "master"
tags:
include:
- "*"

jobs:
- job: 'mac'
pool:
vmImage: 'macOS-10.14'
strategy:
matrix:
Python27:
python.version: '2.7'
TOXENV: py27
MACOS_VERSION: '10.14'
reaperhulk marked this conversation as resolved.
Show resolved Hide resolved
Python37:
python.version: '3.7'
TOXENV: py37
MACOS_VERSION: '10.14'
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'
OPENSSL_DIR: 'OpenSSL-Win32-2010'
PYTHON_DIR: 'Python27'
WINDOWS_ARCH: 'x86'
Python27-x86-64:
TOXENV: py27
containerImage: 'pyca/cryptography-runner-windows:py27-x86_64'
OPENSSL_DIR: 'OpenSSL-Win64-2010'
PYTHON_DIR: 'Python27'
WINDOWS_ARCH: 'x86_64'
Python34-x86:
TOXENV: py34
containerImage: 'pyca/cryptography-runner-windows:py34-x86'
OPENSSL_DIR: 'OpenSSL-Win32-2010'
PYTHON_DIR: 'Python34'
WINDOWS_ARCH: 'x86'
Python34-x86-64:
TOXENV: py34
containerImage: 'pyca/cryptography-runner-windows:py34-x86_64'
OPENSSL_DIR: 'OpenSSL-Win64-2010'
PYTHON_DIR: 'Python34'
WINDOWS_ARCH: 'x86_64'
Python35-x86:
TOXENV: py35
containerImage: 'pyca/cryptography-runner-windows:py35-x86'
OPENSSL_DIR: 'OpenSSL-Win32-2015'
PYTHON_DIR: 'Python35'
WINDOWS_ARCH: 'x86'
Python35-x86-64:
TOXENV: py35
containerImage: 'pyca/cryptography-runner-windows:py35-x86_64'
OPENSSL_DIR: 'OpenSSL-Win64-2015'
PYTHON_DIR: 'Python35'
WINDOWS_ARCH: 'x86_64'
Python36-x86:
TOXENV: py36
containerImage: 'pyca/cryptography-runner-windows:py3-x86'
OPENSSL_DIR: 'OpenSSL-Win32-2015'
PYTHON_DIR: 'Python36'
WINDOWS_ARCH: 'x86'
Python36-x86-64:
TOXENV: py36
containerImage: 'pyca/cryptography-runner-windows:py3-x86_64'
OPENSSL_DIR: 'OpenSSL-Win64-2015'
PYTHON_DIR: 'Python36'
WINDOWS_ARCH: 'x86_64'
Python37-x86:
TOXENV: py37
containerImage: 'pyca/cryptography-runner-windows:py3-x86'
OPENSSL_DIR: 'OpenSSL-Win32-2015'
PYTHON_DIR: 'Python37'
WINDOWS_ARCH: 'x86'
Python37-x86-64:
TOXENV: py37
containerImage: 'pyca/cryptography-runner-windows:py3-x86_64'
OPENSSL_DIR: 'OpenSSL-Win64-2015'
PYTHON_DIR: 'Python37'
WINDOWS_ARCH: 'x86_64'
steps:
- script: "C:/%PYTHON_DIR%/Scripts/tox"
displayName: 'Run tests'