diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2020-11-11 17:56:58 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-11 18:56:58 -0500 |
| commit | a07da37f14fdd8e856bfef78bf81b46faff335c4 (patch) | |
| tree | 76d4a1fa90034d18ede78584a68e8b8379b034da | |
| parent | ce9645a9c75acb954709ce952931129c0f4fa345 (diff) | |
| download | cryptography-a07da37f14fdd8e856bfef78bf81b46faff335c4.tar.gz | |
port docs and docs-linkcheck (#5563)
* port docs and docs-linkcheck
* allow linkcheck if the commit msg says linkcheck
combine docs job into lint jobs
* can't get the commit msg at this time on a PR
| -rw-r--r-- | .github/workflows/ci.yml | 17 | ||||
| -rw-r--r-- | .travis.yml | 10 |
2 files changed, 16 insertions, 11 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d4996232b..199228906 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: PYTHON: - - {VERSION: "3.9", TOXENV: "pep8,packaging", COVERAGE: "false"} + - {VERSION: "3.9", TOXENV: "pep8,packaging,docs", COVERAGE: "false"} - {VERSION: "pypy2", TOXENV: "pypy-nocoverage", COVERAGE: "false"} - {VERSION: "pypy3", TOXENV: "pypy3-nocoverage", COVERAGE: "false"} - {VERSION: "2.7", TOXENV: "py27", OPENSSL: {TYPE: "openssl", VERSION: "1.1.0l"}} @@ -230,3 +230,18 @@ jobs: - run: ./.github/downstream.d/${{ matrix.DOWNSTREAM }}.sh install - run: pip install . - run: ./.github/downstream.d/${{ matrix.DOWNSTREAM }}.sh run + + docs-linkcheck: + if: github.event_name == 'push' && github.ref == 'refs/heads/master' + runs-on: ubuntu-latest + name: "linkcheck" + steps: + - uses: actions/checkout@v2 + - name: Setup python + uses: actions/setup-python@v2 + with: + python-version: 3.9 + - run: python -m pip install -U tox + - run: tox -r -- --color=yes + env: + TOXENV: docs-linkcheck diff --git a/.travis.yml b/.travis.yml index 03716a386..873a432cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,16 +19,6 @@ branches: matrix: include: # Setting 'python' is just to make travis's UI a bit prettier - - python: 3.8 - env: TOXENV=docs - addons: - apt: - packages: - - libenchant-dev - - python: 3.8 - env: TOXENV=docs-linkcheck - if: (branch = master AND type != pull_request) OR commit_message =~ /linkcheck/ - # TODO: This needs to be moved to GHA, but it fails there. The # confusing part is why it passes on Travis! - python: 3.7 |