Update badge locations

cedadev · Mar 7, 2024 · 9b1ee40 · 9b1ee40
1 parent 0ef58c8
commit 9b1ee40
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -41,14 +41,14 @@ jobs:
         python -m pytest --cov=.
         cp .coverage .coverage.${{ matrix.python-version }}
     - name: Upload coverage report
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: "coverage-data"
         path: .coverage.${{ matrix.python-version }}
         if-no-files-found: ignore
 
   coverage:
-    name: "Combine and check coverage"
+    name: "coverage"
     needs: tests
     runs-on: ubuntu-latest
     steps:
@@ -62,7 +62,7 @@ jobs:
         run: |
           python -m pip install --upgrade coverage[toml] coverage-badge
       - name: "Download coverage data"
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: "coverage-data"
       - name: "Combine coverage and fail it it’s under 100 %"
@@ -79,14 +79,14 @@ jobs:
           mkdir -p docs/build/html/htmlcov/${GITHUB_REF_NAME}
           cp -r htmlcov/ docs/build/html/htmlcov/${GITHUB_REF_NAME}
       - name: "Upload HTML report if check failed"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: html-report
           path: htmlcov
         # Commented out to save future 
         # if: ${{ failure() }}
       - name: "Upload badge"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: covbadge
           path: coverage.svg
@@ -109,19 +109,19 @@ jobs:
       uses: ammaraskar/sphinx-action@master
       with: 
         docs-folder: "docs/"
-        pre-build-command: "mkdir -p docs/build/html && chmod 777 docs/build/html && chown 1001 docs/build/html"
-    # - name: "Download coverage report"
-    #   uses: actions/download-artifact@v3
-    #   with:
-    #     name: "html-report"
-    #     path: "htmlcov/"
+        pre-build-command: "mkdir -p docs/build/html/coverage && chmod 777 docs/build/html/coverage && chown 1001 docs/build/html/coverage"
+    - name: "Download coverage report"
+      uses: actions/download-artifact@4
+      with:
+        name: "html-report"
+        path: "docs/build/html/coverage/htmlcov/"
     - name: "Download coverage badge"
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: "covbadge"
         path: "docs/build/html"
     - name: Upload artifacts
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4"
       with:
         name: html-docs
         path: docs/build/html/

diff --git a/README.md b/README.md
@@ -1,10 +1,10 @@
 CEDA Near-Line Data Store
 =========================
 
-[![Tests](https://github.com/cedadev/nlds/actions/workflows/testing.yml/badge.svg)](https://github.com/cedadev/nlds/actions/workflows/testing.yml)
-[![Documentation](https://github.com/cedadev/nlds/actions/workflows/sphinx.yml/badge.svg)](https://github.com/cedadev/nlds/actions/workflows/sphinx.yml)
+[![Testing](https://github.com/cedadev/nlds/actions/workflows/ci.yml/badge.svg)](https://github.com/cedadev/nlds/actions/workflows/ci.yml)
+[![Docs](https://github.com/cedadev/nlds/actions/workflows/pages/pages-build-deployment/badge.svg)](https://github.com/cedadev/nlds/actions/workflows/pages/pages-build-deployment)
 [![PEP8](https://img.shields.io/badge/code%20style-pep8-orange.svg)](https://www.python.org/dev/peps/pep-0008/)
-[![Coverage](https://github.com/cedadev/nlds/actions/workflows/testing.yml/coverage.svg)](https://github.com/cedadev/nlds/actions/workflows/testing.yml/htmlcov)
+[![Coverage](https://cedadev.github.io/nlds/coverage.svg)](https://cedadev.github.io/nlds/coverage/htmlcov/)
 
 This is the HTTP API server code for the CEDA Near-Line Data Store (NLDS).
 It requires the use of the NLDS client, either the command line or library: