Update documentation build/installation

1 files changed, 16 insertions, 21 deletions

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 70128365..5543a7d8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,21 +19,20 @@ on:
     # have reliable testing.
     - cron: '12 4 * * 5'
 jobs:
-  Distfiles:
-    # Generate distfiles.zip, which is a prerequisite for the mac and
-    # Windows builds. Only the mac and Windows builds actually "need"
-    # it, but declaring all the jobs to need it forces it to run
-    # first.
+  Prebuild:
+    # Run steps that are needed by the Windows build but are easier to
+    # build on Linux. Although only the Windows builds need this,
+    # other jobs depend on it to force it to run early.
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: 'Create distfiles.zip'
-        run: build-scripts/make-distfiles
+      - name: 'Run pre-build steps'
+        run: build-scripts/prebuild
       - name: 'Upload extra distribution files'
         uses: actions/upload-artifact@v1
         with:
-          name: distfiles
-          path: distfiles.zip
+          name: doc
+          path: doc.zip
       - name: 'Upload external libs'
         uses: actions/upload-artifact@v1
         with:
@@ -52,7 +51,7 @@ jobs:
           path: distribution
   Windows:
     runs-on: windows-latest
-    needs: Distfiles
+    needs: Prebuild
     strategy:
       fail-fast: false
       max-parallel: 4
@@ -64,10 +63,10 @@ jobs:
         shell: bash
         run: git config --global core.autocrlf input
       - uses: actions/checkout@v2
-      - name: 'Download distribution files'
+      - name: 'Download documentation'
         uses: actions/download-artifact@v2
         with:
-          name: distfiles
+          name: doc
           path: .
       - name: 'Download external libs'
         uses: actions/download-artifact@v2
@@ -84,13 +83,9 @@ jobs:
           path: distribution
   macOS:
     runs-on: macos-latest
-    needs: Distfiles
+    needs: Prebuild
     steps:
       - uses: actions/checkout@v2
-      - name: 'Download distribution files'
-        uses: actions/download-artifact@v2
-        with:
-          name: distfiles
       - name: 'Download external libs'
         uses: actions/download-artifact@v2
         with:
@@ -100,7 +95,7 @@ jobs:
         run: build-scripts/build-mac
   AppImage:
     runs-on: ubuntu-latest
-    needs: Distfiles
+    needs: Prebuild
     steps:
       - uses: actions/checkout@v2
       - name: 'Build AppImage'
@@ -112,21 +107,21 @@ jobs:
           path: distribution
   Linux32:
     runs-on: ubuntu-latest
-    needs: Distfiles
+    needs: Prebuild
     steps:
       - uses: actions/checkout@v2
       - name: 'Linux 32-bit'
         run: build-scripts/build-linux32
   Fuzzers:
     runs-on: ubuntu-latest
-    needs: Distfiles
+    needs: Prebuild
     steps:
       - uses: actions/checkout@v2
       - name: 'Build Fuzzer'
         run: build-scripts/build-fuzzer
   Sanitizers:
     runs-on: ubuntu-latest
-    needs: Distfiles
+    needs: Prebuild
     steps:
       - uses: actions/checkout@v2
       - name: 'Sanitizer Tests'