Browse Source

clean up CI jobs

Steven Silvester 4 years ago
parent
commit
45e23d8b72
3 changed files with 17 additions and 6 deletions
  1. 1 1
      .github/workflows/linuxtests.yml
  2. 1 1
      .github/workflows/windowstests.yml
  3. 15 4
      scripts/ci_script.sh

+ 1 - 1
.github/workflows/linuxtests.yml

@@ -7,7 +7,7 @@ jobs:
     name: Linux
     strategy:
       matrix:
-        group: [integrity, integrity2, docs, usage, python, examples, nonode]
+        group: [integrity, integrity2, docs, usage, python, examples, nonode, linkcheck, lint]
         python: [3.5, 3.8]
         exclude:
           - group: integrity

+ 1 - 1
.github/workflows/windowstests.yml

@@ -7,7 +7,7 @@ jobs:
     name: Windows
     strategy:
       matrix:
-        group: [integrity, integrity2, usage, python, examples, nonode]
+        group: [integrity, integrity2, usage, python, examples, docs]
       fail-fast: false
     runs-on: windows-latest
     steps:

+ 15 - 4
scripts/ci_script.sh

@@ -45,6 +45,18 @@ if [[ $GROUP == docs ]]; then
     make html
     popd
 
+    # Build the API docs
+    jlpm build:packages
+    jlpm docs
+fi
+
+if [[ $GROUP == linkcheck ]]; then
+    # Build the tutorial docs
+    pushd docs
+    pip install -r ./requirements.txt
+    make html
+    popd
+
     # Run the link check on the built html files
     CACHE_DIR="${HOME}/.cache/pytest-link-check"
     mkdir -p ${CACHE_DIR}
@@ -56,10 +68,6 @@ if [[ $GROUP == docs ]]; then
     args="--ignore docs/build/html/genindex.html --ignore docs/build/html/search.html ${args}"
     py.test $args --links-ext .html -k .html docs/build/html || py.test $args --links-ext .html -k .html --lf docs/build/html
 
-    # Build the API docs
-    jlpm build:packages
-    jlpm docs
-
     # Run the link check on md files - allow for a link to fail once (--lf means only run last failed)
     args="--check-links --check-links-cache --check-links-cache-expire-after ${LINKS_EXPIRE} --check-links-cache-name ${CACHE_DIR}/cache"
     py.test $args --links-ext .md -k .md . || py.test $args --links-ext .md -k .md --lf .
@@ -72,7 +80,10 @@ if [[ $GROUP == integrity ]]; then
 
     # Check yarn.lock file
     jlpm check --integrity
+fi
+
 
+if [[ $GROUP == lint ]]; then
     # Lint our files.
     jlpm run lint:check || (echo 'Please run `jlpm run lint` locally and push changes' && exit 1)
 fi