From 2f15dfbd5b49ef44bc61ab8e614a48a9579d2420 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Tue, 30 Oct 2018 04:53:33 +0800 Subject: 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 --- .travis.yml | 4 ++++ 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 = "" -- cgit v1.2.3