fix workflows

moves-rwth · Oct 12, 2024 · 78ed16f · 78ed16f
1 parent f45bd76
commit 78ed16f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -4,6 +4,8 @@ on:
   # Runs on pushes targeting the default branch
   push:
     branches: [main]
+  pull_request:
+    types: [opened, reopened]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref_name }}
@@ -58,15 +60,9 @@ jobs:
           files: |
             docs/**/*.ipynb
 
-<<<<<<< HEAD
-      - name: Run documentation notebooks
-        run: |
-          poetry run jupyter nbconvert --execute --ExecutePreprocessor.kernel_name=python3 --to notebook --inplace ${{ steps.glob.outputs.paths }}
-=======
      # - name: Run documentation notebooks
      #   run: |
      #     poetry run jupyter nbconvert --execute --to notebook --inplace ${{ steps.glob.outputs.paths }}
->>>>>>> main
 
       - name: Generate docs
         working-directory: docs/

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -55,12 +55,6 @@ jobs:
           files: |
             docs/**/*.ipynb
 
-<<<<<<< HEAD
-      - name: Run documentation notebooks
-        run: |
-          poetry run jupyter nbconvert --execute --ExecutePreprocessor.kernel_name=python3 --to notebook --inplace ${{ steps.glob.outputs.paths }}
-=======
      # - name: Run documentation notebooks
      #   run: |
      #     poetry run jupyter nbconvert --execute --to notebook --inplace ${{ steps.glob.outputs.paths }}
->>>>>>> main