diff options
| -rw-r--r-- | .github/workflows/ci.yml | 47 | ||||
| -rw-r--r-- | azure-pipelines.yml | 71 |
2 files changed, 42 insertions, 76 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 80fcc4f7..1a2eb183 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,6 +8,43 @@ on: - '*.*.*' jobs: + macos: + runs-on: macos-latest + strategy: + matrix: + PYTHON: + - {VERSION: "2.7", TOXENV: "py27"} + - {VERSION: "3.5", TOXENV: "py35"} + - {VERSION: "3.6", TOXENV: "py36"} + - {VERSION: "3.7", TOXENV: "py37"} + - {VERSION: "3.8", TOXENV: "py38"} + name: "Python ${{ matrix.PYTHON.VERSION }} on macOS" + steps: + - uses: actions/checkout@master + - name: Setup python + uses: actions/setup-python@v1 + with: + python-version: ${{ matrix.PYTHON.VERSION }} + + - run: brew update + - run: brew install openssl@1.1 + - run: python -m pip install tox coverage + + - run: git clone https://github.com/google/wycheproof + + - run: | + CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1 \ + LDFLAGS="/usr/local/opt/openssl\\@1.1/lib/libcrypto.a /usr/local/opt/openssl\\@1.1/lib/libssl.a" \ + CFLAGS="-I/usr/local/opt/openssl\\@1.1/include -Werror -Wno-error=deprecated-declarations -Wno-error=incompatible-pointer-types-discards-qualifiers -Wno-error=unused-function -Wno-error=unused-command-line-argument -mmacosx-version-min=10.9" \ + tox -r -- --color=yes --wycheproof-root=wycheproof + env: + TOXENV: ${{ matrix.PYTHON.TOXENV }} + + - name: Upload coverage + run: | + curl -o codecov.sh -f https://codecov.io/bash + bash codecov.sh -n "Python ${{ matrix.PYTHON.VERSION }} on macOS" -Z + windows: runs-on: windows-latest strategy: @@ -37,7 +74,7 @@ jobs: Remove-Item VCForPython27.msi -Force shell: powershell if: matrix.PYTHON.VERSION == '2.7' - - run: pip install tox requests coverage + - run: python -m pip install tox requests coverage - name: Download OpenSSL run: | python .github/workflows/download_openssl.py openssl-${{ matrix.WINDOWS.WINDOWS }}-${{ matrix.PYTHON.MSVC_VERSION }} @@ -51,7 +88,7 @@ jobs: env: TOXENV: ${{ matrix.PYTHON.TOXENV }} - - uses: codecov/codecov-action@v1 - with: - name: "Python ${{ matrix.PYTHON.VERSION }} on ${{ matrix.WINDOWS.WINDOWS }}" - fail_ci_if_error: true + - name: Upload coverage + run: | + curl -o codecov.sh -f https://codecov.io/bash + bash codecov.sh -n "Python ${{ matrix.PYTHON.VERSION }} on ${{ matrix.WINDOWS.WINDOWS }}" -Z diff --git a/azure-pipelines.yml b/azure-pipelines.yml deleted file mode 100644 index cd979e02..00000000 --- a/azure-pipelines.yml +++ /dev/null @@ -1,71 +0,0 @@ -variables: - agent.preferPowerShellOnContainers: true - -trigger: - branches: - include: - - "master" - - "*.x" - tags: - include: - - "*" -pr: - - "*" - -jobs: -- job: 'mac' - pool: - vmImage: $[variables.vmImage] - strategy: - matrix: - Python27-macOS1014: - python.version: '2.7' - TOXENV: py27 - vmImage: 'macOS-10.14' - MACOS_VERSION: '10.14' - Python38-macOS1014: - python.version: '3.8' - TOXENV: py38 - vmImage: 'macOS-10.14' - MACOS_VERSION: '10.14' - Python27-macOS1015: - python.version: '2.7' - TOXENV: py27 - vmImage: 'macOS-10.15' - MACOS_VERSION: '10.15' - Python38-macOS1015: - python.version: '3.8' - TOXENV: py38 - vmImage: 'macOS-10.15' - MACOS_VERSION: '10.15' - steps: - - task: UsePythonVersion@0 - inputs: - versionSpec: '$(python.version)' - architecture: 'x64' - - - script: brew update - displayName: 'brew update' - - - script: brew install openssl@1.1 - displayName: 'Install OpenSSL' - - - script: pip install tox codecov - displayName: 'Install tox & codecov' - - - script: git clone https://github.com/google/wycheproof - displayName: 'Clone wycheproof' - - - script: | - set -e - set -x - - CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1 \ - LDFLAGS="/usr/local/opt/openssl\\@1.1/lib/libcrypto.a /usr/local/opt/openssl\\@1.1/lib/libssl.a" \ - CFLAGS="-I/usr/local/opt/openssl\\@1.1/include -Werror -Wno-error=deprecated-declarations -Wno-error=incompatible-pointer-types-discards-qualifiers -Wno-error=unused-function -Wno-error=unused-command-line-argument -mmacosx-version-min=10.9" \ - tox -r -- --color=yes --wycheproof-root=wycheproof - displayName: 'Run tests' - - - script: codecov -e MACOS_VERSION,AGENT_OS,TOXENV - displayName: 'Submit coverage' - condition: succeeded() |