Rewrite build tools (#1958)

vkbo · Jul 4, 2024 · 3fd0385 · 3fd0385
2 parents b91a119 + 5f3f551
commit 3fd0385
Show file tree

Hide file tree

Showing 8 changed files with 622 additions and 782 deletions.
diff --git a/.github/workflows/build_assets.yml b/.github/workflows/build_assets.yml
@@ -25,9 +25,7 @@ jobs:
 
       - name: Build Assets
         run: |
-          python pkgutils.py manual
-          python pkgutils.py sample
-          python pkgutils.py qtlrelease
+          python pkgutils.py build-assets
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4

diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
@@ -6,7 +6,7 @@ jobs:
   buildAssets:
     uses: ./.github/workflows/build_assets.yml
 
-  buildLinux:
+  buildLinux-AppImage:
     needs: buildAssets
     runs-on: ubuntu-latest
     env:

diff --git a/.github/workflows/build_win.yml b/.github/workflows/build_win.yml
@@ -15,5 +15,23 @@ jobs:
         with:
           python-version: "3.12"
           architecture: x64
+
       - name: Checkout Source
         uses: actions/checkout@v4
+
+      - name: Download Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: nw-assets
+          path: novelwriter/assets
+
+      - name: Build Setup Installer
+        run: python pkgutils.py build-win-exe
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: Win-Setup
+          path: dist/*.exe
+          if-no-files-found: error
+          retention-days: 14
diff --git a/.github/workflows/test_linux.yml b/.github/workflows/test_linux.yml
@@ -33,7 +33,9 @@ jobs:
         run: |
           pip install -U -r requirements.txt -r tests/requirements.txt
       - name: Run Build Commands
-        run: python pkgutils.py qtlrelease sample
+        run: |
+          python pkgutils.py qtlrelease
+          python pkgutils.py sample
       - name: Run Tests
         run: |
           export QT_QPA_PLATFORM=offscreen