diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2018-10-30 04:53:33 +0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2018-10-29 16:53:33 -0400 |
| commit | 2f15dfbd5b49ef44bc61ab8e614a48a9579d2420 (patch) | |
| tree | 46b1c2ad98706ceb863d3ec1193a4fe4f25a012e | |
| parent | 983b35e7b0b76e687889f755d62c3a95dd485944 (diff) | |
| download | cryptography-2f15dfbd5b49ef44bc61ab8e614a48a9579d2420.tar.gz cryptography-2f15dfbd5b49ef44bc61ab8e614a48a9579d2420.tar.bz2 cryptography-2f15dfbd5b49ef44bc61ab8e614a48a9579d2420.zip | |
move linkcheck to travis (#4544)
* move linkcheck to travis
only run it on master merges just like we do on jenkins
* don't build for a PR
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | Jenkinsfile | 11 |
2 files changed, 4 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index 87edf435..5b8bbbbc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -138,6 +138,10 @@ matrix: # urllib3 tests fail on xenial for whatever reason dist: trusty sudo: false + - python: 2.7 + services: docker + env: TOXENV=docs-linkcheck DOCKER=pyca/cryptography-runner-buster + if: branch = master AND type != pull_request install: - ./.travis/install.sh diff --git a/Jenkinsfile b/Jenkinsfile index b9d86986..14a1ed7f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,17 +28,6 @@ def configs = [ ], ] -/* Add the linkcheck job to our config list if we're on master */ -if (env.BRANCH_NAME == "master") { - configs.add( - [ - label: 'docker', - imageName: 'pyca/cryptography-runner-buster', - toxenvs: ['docs-linkcheck'], - ] - ) -} - def checkout_git(label) { retry(3) { def script = "" |