From 697230b7041c4538c3900028cfc0d8c67b82b132 Mon Sep 17 00:00:00 2001
From: Garth Minette <revarbat@gmail.com>
Date: Sun, 30 May 2021 20:59:13 -0700
Subject: [PATCH 1/2] Try to fix bad docs image generation by moving to Ubuntu
 VM.

---
 .github/workflows/docsgen.yml | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/docsgen.yml b/.github/workflows/docsgen.yml
index 447de46f..a61802ac 100644
--- a/.github/workflows/docsgen.yml
+++ b/.github/workflows/docsgen.yml
@@ -1,14 +1,17 @@
-name: CI
+name: DocsGen
 on:
   pull_request:
     branches:
       - master
     types: [closed]
+  workflow_dispatch:
+    branches:
+      - master
 
 jobs:
   GenerateDocs:
     if: github.event.pull_request.merged == true
-    runs-on: macos-10.15
+    runs-on: ubuntu-latest
     steps:
     - name: Checkout
       uses: actions/checkout@v2
@@ -19,27 +22,31 @@ jobs:
         repository: revarbat/BOSL2.wiki
         path: BOSL2.wiki
 
-    - name: Install gifsicle
-      run: brew install gifsicle
+    - name: Apt Update
+      run: sudo apt update
 
-    - name: Install Pillow
-      run: sudo pip3 install Pillow
+    - name: Install Packages
+      run: sudo apt-get install -y python3-pip python3-dev python3-setuptools python3-pil gifsicle
 
-    - name: Install Docsgen
+    - name: Install openscad-docsgen
       run: sudo pip3 install openscad_docsgen
 
+    - name: Install gifsicle
+      run: sudo pip3 install gifsicle
+
     - name: Install OpenSCAD
       run: |
-        curl -L -o OpenSCAD.dmg https://files.openscad.org/snapshots/OpenSCAD-2021.05.07.dmg
-        hdiutil attach OpenSCAD.dmg
-        cp -a /Volumes/OpenSCAD/OpenSCAD.app /Applications/
+        cd $GITHUB_WORKSPACE
+        wget https://files.openscad.org/OpenSCAD-2021.01-x86_64.AppImage
+        sudo mv OpenSCAD-2021.01*-x86_64.AppImage /usr/local/bin/openscad
+        sudo chmod +x /usr/local/bin/openscad
 
     - name: Generating Docs
       run: |
         cd $GITHUB_WORKSPACE
         export OPENSCADPATH=$(dirname $GITHUB_WORKSPACE)
         echo "::add-matcher::.github/openscad_docsgen.json"
-        openscad-docsgen -m -i -t -c -I *.scad
+        openscad-docsgen -ticmI *.scad
         cd BOSL2.wiki
         git config user.name github-actions
         git config user.email github-actions@github.com

From 8f138be8aa0afa2b0c96532e7ba6b6b450bc6884 Mon Sep 17 00:00:00 2001
From: Garth Minette <revarbat@gmail.com>
Date: Sun, 30 May 2021 21:10:17 -0700
Subject: [PATCH 2/2] Enable manual forced docsgen.

---
 .github/workflows/docsgen.yml        |  8 ++---
 .github/workflows/forced_docsgen.yml | 49 ++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 6 deletions(-)
 create mode 100644 .github/workflows/forced_docsgen.yml

diff --git a/.github/workflows/docsgen.yml b/.github/workflows/docsgen.yml
index a61802ac..4ce201fc 100644
--- a/.github/workflows/docsgen.yml
+++ b/.github/workflows/docsgen.yml
@@ -1,12 +1,8 @@
-name: DocsGen
+name: Docs
 on:
   pull_request:
-    branches:
-      - master
+    branches: [master]
     types: [closed]
-  workflow_dispatch:
-    branches:
-      - master
 
 jobs:
   GenerateDocs:
diff --git a/.github/workflows/forced_docsgen.yml b/.github/workflows/forced_docsgen.yml
new file mode 100644
index 00000000..bf1d7b5c
--- /dev/null
+++ b/.github/workflows/forced_docsgen.yml
@@ -0,0 +1,49 @@
+name: FDocs
+on:
+  workflow_dispatch:
+    branches: [master]
+
+jobs:
+  GenerateDocs:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Checkout Wiki
+      uses: actions/checkout@v2
+      with:
+        repository: revarbat/BOSL2.wiki
+        path: BOSL2.wiki
+
+    - name: Apt Update
+      run: sudo apt update
+
+    - name: Install Packages
+      run: sudo apt-get install -y python3-pip python3-dev python3-setuptools python3-pil gifsicle
+
+    - name: Install openscad-docsgen
+      run: sudo pip3 install openscad_docsgen
+
+    - name: Install gifsicle
+      run: sudo pip3 install gifsicle
+
+    - name: Install OpenSCAD
+      run: |
+        cd $GITHUB_WORKSPACE
+        wget https://files.openscad.org/OpenSCAD-2021.01-x86_64.AppImage
+        sudo mv OpenSCAD-2021.01*-x86_64.AppImage /usr/local/bin/openscad
+        sudo chmod +x /usr/local/bin/openscad
+
+    - name: Generating Docs
+      run: |
+        cd $GITHUB_WORKSPACE
+        export OPENSCADPATH=$(dirname $GITHUB_WORKSPACE)
+        echo "::add-matcher::.github/openscad_docsgen.json"
+        openscad-docsgen -ticmIf *.scad
+        cd BOSL2.wiki
+        git config user.name github-actions
+        git config user.email github-actions@github.com
+        git add --all
+        git commit -m "Wiki docs auto-regen." && git push || true
+