Merge pull request #35 from opsmill/develop

...
opsmill · Nov 16, 2023 · ec8c90b · ec8c90b
2 parents f263bcb + ca67a71
commit ec8c90b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 16 deletions.
diff --git a/.github/workflows/trigger-pr-stable.yml b/.github/workflows/trigger-pr-stable.yml
@@ -17,17 +17,3 @@ jobs:
   tests:
     needs: ["linter"]
     uses: ./.github/workflows/workflow-tests.yml
-
-  docs:
-    needs: ["linter", "tests"]
-    uses: ./.github/workflows/workflow-docs.yml
-    secrets: inherit
-
-  changelog:
-    needs: ["docs"]
-    uses: ./.github/workflows/workflow-changelog.yml
-    secrets: inherit
-
-  release:
-    needs: ["changelog"]
-    uses: ./.github/workflows/workflow-release-drafter.yml
diff --git a/.github/workflows/workflow-changelog-and-docs.yml b/.github/workflows/workflow-changelog-and-docs.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   generate_changelog:
     runs-on: "ubuntu-22.04"
-    name: "Create Changelog"
+    name: "Create Changelog and Docs"
     steps:
       - uses: actions/[email protected]
         with:
@@ -21,7 +21,7 @@ jobs:
           python-version: 3.11
 
       - name: Install antsibull-changelog, antsichaut
-        run: python -m pip install toml invoke antsibull-changelog antsichaut --disable-pip-version-check
+        run: python -m pip install toml invoke antsibull-changelog antsibull-docs antsichaut --disable-pip-version-check
 
       - name: Install pandoc
         run: sudo apt-get install pandoc