Merge branch 'dev'

misje · May 15, 2024 · 0f0ca27 · 0f0ca27
2 parents 844b6a6 + 1f8702a
commit 0f0ca27
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 33 deletions.
diff --git a/.github/workflows/build_docs.yml → .github/workflows/build_deploy_docs.yml b/.github/workflows/build_docs.yml → .github/workflows/build_deploy_docs.yml
@@ -1,16 +1,13 @@
-# Build Sphinx docs as HTML (for "Deploy docs" to deploy if running on master
-# branch)
-
-name: Build docs
+name: Build and deploy docs
 on:
   push:
     paths:
-      - .github/workflows/build_docs.yml
+      - .github/workflows/build_deploy_docs.yml
       - docs/source/**
       - src/**/*.py
   pull_request:
     paths:
-      - .github/workflows/build_docs.yml
+      - .github/workflows/build_deploy_docs.yml
       - docs/source/**
       - src/**/*.py
   workflow_dispatch:
@@ -34,3 +31,16 @@ jobs:
       - uses: actions/upload-pages-artifact@v3
         with:
           path: docs/build
+  deploy:
+    needs: [build-docs]
+    runs-on: ubuntu-22.04
+    if: github.ref == 'refs/heads/master' || github.event_name == 'workflow_dispatch'
+    permissions:
+      pages: write
+      id-token: write
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    steps:
+      - id: deployment
+        uses: actions/deploy-pages@v4
diff --git a/.github/workflows/deploy_docs.yml b/.github/workflows/deploy_docs.yml