From 883f3cdfb5292951acc9ece053a104639e5090f3 Mon Sep 17 00:00:00 2001
From: Nicolas Williams <nico@twosigma.com>
Date: Sat, 15 Jan 2022 21:29:46 -0600
Subject: [PATCH] GitHub: Fix linux build (make dist)?

---
 .github/workflows/linux.yml | 11 ++++++++---
 .github/workflows/osx.yml   | 14 --------------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index b1d00a466..c416a7d1c 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -69,7 +69,12 @@ jobs:
               if: startsWith(matrix.os, 'ubuntu')
               run: |
                 sudo apt-get update -qq
-                sudo apt-get install -y bison comerr-dev flex libcap-ng-dev libdb-dev libedit-dev libjson-perl libldap2-dev libncurses5-dev libperl4-corelibs-perl libsqlite3-dev libkeyutils-dev pkg-config python ss-dev texinfo unzip netbase keyutils ldap-utils gdb apport curl libmicrohttpd-dev jq valgrind
+                sudo apt-get install -y bison comerr-dev flex doxygen
+                sudo apt-get install -y libcap-ng-dev libdb-dev libedit-dev libjson-perl
+                sudo apt-get install -y libldap2-dev libncurses5-dev libperl4-corelibs-perl
+                sudo apt-get install -y libsqlite3-dev libkeyutils-dev pkg-config python
+                sudo apt-get install -y ss-dev texinfo unzip netbase keyutils ldap-utils
+                sudo apt-get install -y gdb apport curl libmicrohttpd-dev jq valgrind
                 # Temporary workaround for:
                 # https://github.com/actions/virtual-environments/issues/3185
                 sudo hostname localhost
@@ -110,15 +115,15 @@ jobs:
               run: |
                 find build -depth -cpio -name \*.trs | xargs grep -lw FAIL | sed -e 's/trs$/log/' | tar -czf $HOME/logs.tgz --verbatim-files-from --files-from -
                 find build -name \*.trs | xargs grep -lw FAIL | sed -e 's/trs$/log/' | xargs cat
-            - name: distclean
+            - name: Make Dist
               run: |
                 cd build
+                make dist
                 make distclean
                 if [ "$(git ls-files -o|grep -v ^build/ | wc -l)" -ne 0 ]; then
                   echo "Files not removed by make distclean:"
                   git ls-files -o|grep -v ^build/
                 fi
-                make dist
             - name: Upload Install Tarball
               uses: actions/upload-artifact@v2
               with:
diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml
index 6055e9424..81b8b1819 100644
--- a/.github/workflows/osx.yml
+++ b/.github/workflows/osx.yml
@@ -99,25 +99,11 @@ jobs:
               run: |
                 find build -depth -cpio -name \*.trs|xargs grep -lw FAIL|sed -e 's/trs$/log/' | cpio -o > $HOME/logs.cpio
                 find build -name \*.trs|xargs grep -lw FAIL|sed -e 's/trs$/log/'|xargs cat
-            - name: distclean
-              run: |
-                cd build
-                make distclean
-                if [ "$(git ls-files -o|grep -v ^build/ | wc -l)" -ne 0 ]; then
-                  echo "Files not removed by make distclean:"
-                  git ls-files -o|grep -v ^build/
-                fi
-                make dist
             - name: Upload Install Tarball
               uses: actions/upload-artifact@v2
               with:
                 name: Install Tarball
                 path: '~/heimdal-install.tgz'
-            - name: Upload Dist Tarball
-              uses: actions/upload-artifact@v2
-              with:
-                name: Dist Tarball
-                path: '~/build/*.tar.gz'
             - name: Upload Artifacts
               uses: actions/upload-artifact@v2
               with: