From 7adbcbaf329a251ee02340ef07ecb9c580c53518 Mon Sep 17 00:00:00 2001
From: dherrada <dylan.herrada@gmail.com>
Date: Sat, 11 Jan 2020 20:28:57 -0500
Subject: [PATCH] Made changes requested by @sommersoft

---
 .github/workflows/build.yml   | 14 ++++----------
 .github/workflows/release.yml | 11 +----------
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 39e7822f..9212ff94 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,17 +30,11 @@ jobs:
         submodules: true
     - name: Install deps
       run: |
-        sudo apt-get install -y gettext gawk
         pip install -r requirements.txt
     - name: Library version
       run: git describe --dirty --always --tags
-    - name: Package Folder Prefix For circuitpython-build-tools (Community Bundle Specific)
-      id: pkg-folder
-      run: |
-        echo ::set-output name=prefix::$(
-        ls -RUx |
-        gawk -F '\n' '{ match($1, /(drivers|helpers)\/(.+)\/(.+)\:/, arr) ; if (length(arr[0]) > 0 && match(arr[3], arr[2]) > 0) printf "%s, ", arr[3] }' |
-        gawk '{ trimmed = substr($0, 1, length($0) - 2) ; print "\"" trimmed "\"" }'
-        )
     - name: Build assets
-      run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location libraries --library_depth 2 --package_folder_prefix ${{ steps.pkg-folder.outputs.prefix }}
+      run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location libraries --library_depth 2
+    - name: Build docs
+      working-directory: docs
+      run: sphinx-build -E -W -b html . _build/html
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d779256e..22727c28 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,18 +32,9 @@ jobs:
         submodules: true
     - name: Install deps
       run: |
-        sudo apt-get install -y gettext gawk
         pip install -r requirements.txt
-    - name: Package Folder Prefix For circuitpython-build-tools (Community Bundle Specific)
-      id: pkg-folder
-      run: |
-        echo ::set-output name=prefix::$(
-        ls -RUx |
-        gawk -F '\n' '{ match($1, /(drivers|helpers)\/(.+)\/(.+)\:/, arr) ; if (length(arr[0]) > 0 && match(arr[3], arr[2]) > 0) printf "%s, ", arr[3] }' |
-        gawk '{ trimmed = substr($0, 1, length($0) - 2) ; print "\"" trimmed "\"" }'
-        )
     - name: Build assets
-      run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location libraries --library_depth 2 --package_folder_prefix ${{ steps.pkg-folder.outputs.prefix }}
+      run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location libraries --library_depth 2
     - name: Upload Release Assets
       # the 'official' actions version does not yet support dynamically
       # supplying asset names to upload. @csexton's version chosen based on