Merge branch 'master' into fix-getting-started

mosa · Jan 17, 2024 · 6c84283 · 6c84283
2 parents 945e4d4 + 0520438
commit 6c84283
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 33 deletions.
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
@@ -2,7 +2,11 @@ name: Builds
 
 on:
   push:
+    paths-ignore:
+      - 'Source/Docs/**'
   pull_request:
+    paths-ignore:
+      - 'Source/Docs/**'
 
 permissions:
   contents: write
@@ -70,7 +74,7 @@ jobs:
 
   windows-build-packaging:
     name: Windows Build Packaging
-    needs: [windows-build, linux-build, macos-build, generate-docs, windows-unit-testing, linux-unit-testing, macos-unit-testing, windows-demo-testing, linux-demo-testing, macos-demo-testing]
+    needs: [windows-build, linux-build, macos-build, windows-unit-testing, linux-unit-testing, macos-unit-testing, windows-demo-testing, linux-demo-testing, macos-demo-testing]
     runs-on: windows-latest
     timeout-minutes: 15
     if: github.event_name == 'push' && github.repository == 'mosa/MOSA-Project' && github.ref == 'refs/heads/master'
@@ -165,38 +169,6 @@ jobs:
           name: macos-build-artifact
           path: bin
 
-  generate-docs:
-    name: Generate Documentation
-    runs-on: ubuntu-latest
-    timeout-minutes: 15
-    if: github.event_name == 'push' && github.repository == 'mosa/MOSA-Project' && github.ref == 'refs/heads/master'
-    steps:
-      - name: Set python3.11
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.11'
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          submodules: recursive
-      - name: Update package repository
-        run: sudo apt-get -y -o Acquire::Check-Valid-Until=false update
-      - name: Install Graphviz
-        run: sudo apt-get install -y graphviz
-      - name: Install Sphinx dependencies
-        run: pip3 install sphinx sphinxcontrib.httpdomain sphinx-prompt sphinx_rtd_theme sphinx-tabs
-      - name: Generate HTML website
-        run: sphinx-build -b html Source/Docs sphinx-docs
-      - name: Copy CNAME file
-        run: cp Source/Docs/CNAME sphinx-docs/
-      - name: Copy .nojekyll file
-        run: cp Source/Docs/.nojekyll sphinx-docs/
-      - name: Deploy to GitHub Pages
-        uses: JamesIves/github-pages-deploy-action@v4
-        with:
-          folder: sphinx-docs
-          branch: docs
-
   windows-unit-testing:
     strategy:
       matrix:

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -0,0 +1,49 @@
+name: Docs
+
+on:
+  push:
+    paths:
+      - 'Source/Docs/**'
+  pull_request:
+    paths:
+      - 'Source/Docs/**'
+
+permissions:
+  contents: write
+
+env:
+  BUILD_VERSION: 2.5.1.${{ github.run_number }}
+
+jobs:
+
+  generate-docs:
+    name: Generate Documentation
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    steps:
+      - name: Set python3.11
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - name: Update package repository
+        run: sudo apt-get -y -o Acquire::Check-Valid-Until=false update
+      - name: Install Graphviz
+        run: sudo apt-get install -y graphviz
+      - name: Install Sphinx dependencies
+        run: pip3 install sphinx sphinxcontrib.httpdomain sphinx-prompt sphinx_rtd_theme sphinx-tabs
+      - name: Generate HTML website
+        run: sphinx-build -b html Source/Docs sphinx-docs
+      - name: Copy CNAME file
+        run: cp Source/Docs/CNAME sphinx-docs/
+      - name: Copy .nojekyll file
+        run: cp Source/Docs/.nojekyll sphinx-docs/
+      - name: Deploy to GitHub Pages
+        if: github.event_name == 'push' && github.repository == 'mosa/MOSA-Project' && github.ref == 'refs/heads/master' 
+        uses: JamesIves/github-pages-deploy-action@v4
+        with:
+          folder: sphinx-docs
+          branch: docs