aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2017-06-06 08:45:01 -1000
committerAlex Gaynor <alex.gaynor@gmail.com>2017-06-06 14:45:01 -0400
commit6bdae781917dfd7e013e85a5435ff44bef702df2 (patch)
tree010587a7542b1de1318ba8848b9f29d58a156bbf
parentcfdc6057e10224fe989eec2f05cce33d0d495a75 (diff)
downloadcryptography-6bdae781917dfd7e013e85a5435ff44bef702df2.tar.gz
cryptography-6bdae781917dfd7e013e85a5435ff44bef702df2.tar.bz2
cryptography-6bdae781917dfd7e013e85a5435ff44bef702df2.zip
run our docs job using 1.1.0 (#3687)
-rw-r--r--.travis.yml2
-rw-r--r--Jenkinsfile4
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 3fca4b48..75c306f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,7 @@ matrix:
- python: 3.5
env: TOXENV=py35 OPENSSL=1.1.0f
- python: 2.7
- env: TOXENV=docs
+ env: TOXENV=docs OPENSSL=1.1.0f
addons:
apt:
packages:
diff --git a/Jenkinsfile b/Jenkinsfile
index 36cc0091..18091c7a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -70,7 +70,7 @@ def configs = [
],
[
label: 'docker',
- imageName: 'pyca/cryptography-runner-ubuntu-rolling',
+ imageName: 'pyca/cryptography-runner-sid',
toxenvs: ['docs'],
artifacts: 'cryptography/docs/_build/html/**',
artifactExcludes: '**/*.doctree',
@@ -87,7 +87,7 @@ if (env.BRANCH_NAME == "master") {
configs.add(
[
label: 'docker',
- imageName: 'pyca/cryptography-runner-ubuntu-rolling',
+ imageName: 'pyca/cryptography-runner-sid',
toxenvs: ['docs-linkcheck'],
]
)