Merge branch 'develop'

PaloAltoNetworks · May 7, 2021 · 10d6f08 · 10d6f08
2 parents 1fd4560 + 4778746
commit 10d6f08
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -130,10 +130,7 @@ jobs:
 
       - name: Generate documentation
         run: |
-          cd docs
-          mkdir -p source/modules
-          ansible-doc-extractor --template templates/module.rst.j2 source/modules ~/.ansible/collections/ansible_collections/paloaltonetworks/panos/plugins/modules/panos*.py
-          sphinx-build source html
+          pipenv run make docs
 
       - name: Deploy to GitHub Pages
         uses: JamesIves/[email protected]

diff --git a/Makefile b/Makefile
@@ -47,7 +47,9 @@ integration:	## Run integration tests
 
 .PHONY: docs
 docs:		## Build collection documentation
-	$(MAKE) -C docs -f Makefile.custom docs
+	mkdir -p docs/source/modules
+	cd docs && ansible-doc-extractor --template templates/module.rst.j2 source/modules ~/.ansible/collections/ansible_collections/paloaltonetworks/panos/plugins/modules/panos*.py
+	cd docs && sphinx-build source html
 
 .PHONY: clean
 clean:		## Remove all auto-generated files