diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2020-11-13 11:13:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-13 10:13:30 -0600 |
| commit | eb02f2127f427dcb53d7ca2b0918844ecf5ca872 (patch) | |
| tree | 8abecbbf1218603e3b7cba074eba7efd0a26e423 | |
| parent | 548b1b2d40f6ab94072871deb90e29e05dc520c4 (diff) | |
| download | cryptography-eb02f2127f427dcb53d7ca2b0918844ecf5ca872.tar.gz | |
Update artifact name for changes from pyca-infra (#5569)
| -rw-r--r-- | .github/workflows/ci.yml | 6 | ||||
| -rw-r--r-- | .github/workflows/download_openssl.py | 1 | ||||
| -rw-r--r-- | .github/workflows/wheel-builder.yml | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 199228906..a0c1625b7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -140,14 +140,14 @@ jobs: - name: Download OpenSSL run: | - python .github/workflows/download_openssl.py macos openssl-macos + python .github/workflows/download_openssl.py macos openssl-macos-x86-64 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Tests run: | CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1 \ - LDFLAGS="${HOME}/openssl-macos/lib/libcrypto.a ${HOME}/openssl-macos/lib/libssl.a" \ - CFLAGS="-I${HOME}/openssl-macos/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.10 -march=core2 $EXTRA_CFLAGS" \ + LDFLAGS="${HOME}/openssl-macos-x86-64/lib/libcrypto.a ${HOME}/openssl-macos-x86-64/lib/libssl.a" \ + CFLAGS="-I${HOME}/openssl-macos-x86-64/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.10 -march=core2 $EXTRA_CFLAGS" \ tox -r -- --color=yes --wycheproof-root=wycheproof env: TOXENV: ${{ matrix.PYTHON.TOXENV }} diff --git a/.github/workflows/download_openssl.py b/.github/workflows/download_openssl.py index 1d5e3bfb4..46b3b7f0e 100644 --- a/.github/workflows/download_openssl.py +++ b/.github/workflows/download_openssl.py @@ -67,6 +67,7 @@ def main(platform, target): os.path.join(path, artifact["name"]) ) return + raise ValueError("Didn't find {} in {}".format(target, response)) if __name__ == "__main__": diff --git a/.github/workflows/wheel-builder.yml b/.github/workflows/wheel-builder.yml index c4bf9ab05..b74edc2da 100644 --- a/.github/workflows/wheel-builder.yml +++ b/.github/workflows/wheel-builder.yml @@ -76,7 +76,7 @@ jobs: - run: ${{ matrix.PYTHON.BIN_PATH }} -m pip install -U virtualenv requests - name: Download OpenSSL run: | - ${{ matrix.PYTHON.BIN_PATH }} .github/workflows/download_openssl.py macos openssl-macos + ${{ matrix.PYTHON.BIN_PATH }} .github/workflows/download_openssl.py macos openssl-macos-x86-64 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -92,8 +92,8 @@ jobs: cd cryptography* CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS="1" \ - LDFLAGS="${HOME}/openssl-macos/lib/libcrypto.a ${HOME}/openssl-macos/lib/libssl.a" \ - CFLAGS="-I${HOME}/openssl-macos/include -mmacosx-version-min=10.10 -march=core2" \ + LDFLAGS="${HOME}/openssl-macos-x86-64/lib/libcrypto.a ${HOME}/openssl-macos-x86-64/lib/libssl.a" \ + CFLAGS="-I${HOME}/openssl-macos-x86-64/include -mmacosx-version-min=10.10 -march=core2" \ ../venv/bin/python setup.py bdist_wheel $PY_LIMITED_API && mv dist/cryptography*.whl ../wheelhouse - run: venv/bin/pip install -f wheelhouse --no-index cryptography - run: | |