From 0145873de724744ca9ec584f0fc7c51079b2e68e Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Mon, 26 Jun 2017 18:56:45 -1000 Subject: parametrize the wheel builder to support out of order releases (#3731) --- .jenkins/Jenkinsfile-cryptography-wheel-builder | 11 +++++++++-- release.py | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.jenkins/Jenkinsfile-cryptography-wheel-builder b/.jenkins/Jenkinsfile-cryptography-wheel-builder index 55429ca4..d06e6efa 100644 --- a/.jenkins/Jenkinsfile-cryptography-wheel-builder +++ b/.jenkins/Jenkinsfile-cryptography-wheel-builder @@ -1,3 +1,10 @@ +properties([ + parameters([ + string(defaultValue: '', description: 'The version from PyPI to build', name: 'BUILD_VERSION') + ]), + pipelineTriggers([]) +]) + def configs = [ [ label: 'windows', @@ -59,7 +66,7 @@ def build(version, label) { virtualenv -p %PYTHON% .release call .release\\Scripts\\activate pip install wheel virtualenv - pip wheel cryptography --wheel-dir=wheelhouse --no-binary cryptography + pip wheel cryptography==$BUILD_VERSION --wheel-dir=wheelhouse --no-binary cryptography pip install -f wheelhouse cryptography --no-index python -c "from cryptography.hazmat.backends.openssl.backend import backend;print('Loaded: ' + backend.openssl_version_text());print('Linked Against: ' + backend._ffi.string(backend._lib.OPENSSL_VERSION_TEXT).decode('ascii'))" """ @@ -88,7 +95,7 @@ def build(version, label) { source .venv/bin/activate pip install -U wheel # upgrade wheel to latest before we use it to build the wheel # -mmacosx-version-min=10.9 can be remove when https://github.com/pyca/cryptography/issues/3635 is resolved - 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 -mmacosx-version-min=10.9" pip wheel cryptography --wheel-dir=wheelhouse --no-binary cryptography + 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 -mmacosx-version-min=10.9" pip wheel cryptography==$BUILD_VERSION --wheel-dir=wheelhouse --no-binary cryptography pip install -f wheelhouse cryptography --no-index python -c "from cryptography.hazmat.backends.openssl.backend import backend;print('Loaded: ' + backend.openssl_version_text());print('Linked Against: ' + backend._ffi.string(backend._lib.OPENSSL_VERSION_TEXT).decode('ascii'))" otool -L `find .venv -name '_openssl*.so'` diff --git a/release.py b/release.py index ec2e8f72..0894d23f 100644 --- a/release.py +++ b/release.py @@ -126,6 +126,7 @@ def release(version): "{0}/build".format(JENKINS_URL), params={ "token": token, + "BUILD_VERSION": version, "cause": "Building wheels for {0}".format(version) } ) -- cgit v1.2.3