Merge branch 'main' into python.

cellml · Nov 5, 2024 · fca3b8e · fca3b8e
2 parents b8cd8f7 + fa756b4
commit fca3b8e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/.github/workflows/deploy-on-release.yml b/.github/workflows/deploy-on-release.yml
@@ -264,7 +264,7 @@ jobs:
 
     - name: Publish libraries
       if: needs.setup-jobs.outputs.binaries-destination == 'Publish'
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2
       with:
         files: ${{ steps.package.outputs.files }}
         tag_name: ${{ github.event.release.tag_name }}
@@ -384,10 +384,6 @@ jobs:
           pattern: '*-wheel'
           merge-multiple: true
 
-      - name: Display downloaded wheels
-        run: |
-          ls wheelhouse
-
       - name: Publish Python wheels
         env:
           name: pypi

diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
@@ -76,7 +76,7 @@ if(LIBCELLML_COVERAGE)
     COMMENT "Running coverage tests with html output")
 endif()
 
-if(SPHINX_FOUND AND DOXYGEN_FOUND AND LIBCELLML_COVERAGE)
+if(SPHINX_FOUND OR DOXYGEN_FOUND OR LIBCELLML_COVERAGE)
   add_custom_target(docs
     DEPENDS ${SPHINX_DOCS_TARGET} ${DOXYGEN_DOCS_TARGET} ${COVERAGE_DOCS_TARGET} ${DOXYGEN_API_XML_DOCS_TARGET}
     COMMENT "Generating documentation")