Merge pull request #655 from matty0ung/release2.4

Build fixes etc for Release 3.0.0 (was 2.4.0)
Brewtarget · Sep 23, 2022 · b42a9f1 · b42a9f1
2 parents f3b8ba9 + 37c0736
commit b42a9f1
Show file tree

Hide file tree

Showing 34 changed files with 2,675 additions and 3,039 deletions.
diff --git a/.github/workflows/linux-ubuntu.yml b/.github/workflows/linux-ubuntu.yml
@@ -26,18 +26,18 @@ jobs:
         shell: bash
         run: |
           sudo apt-get update && sudo apt-get install -y \
-            qtbase5-dev \
-            qttools5-dev \
-            qttools5-dev-tools \
-            qtmultimedia5-dev \
-            libqt5sql5-sqlite \
+            libqt5multimedia5-plugins \
             libqt5sql5-psql \
+            libqt5sql5-sqlite \
             libqt5svg5-dev \
-            libqt5multimedia5-plugins \
-            lintian \
-            rpmlint \
+            libxalan-c-dev \
             libxerces-c-dev \
-            libxalan-c-dev
+            lintian \
+            qtbase5-dev \
+            qtmultimedia5-dev \
+            qttools5-dev \
+            qttools5-dev-tools \
+            rpmlint
           cd ~
           mkdir ~/boost-tmp
           cd ~/boost-tmp
@@ -49,11 +49,6 @@ jobs:
           cd ~
           sudo rm -rf ~/boost-tmp
 
-      - name: Apply Patches
-        shell: bash
-        working-directory: ${{github.workspace}}
-        run: ./build-scripts/linux/apply-patches.sh $GITHUB_WORKSPACE
-
       - name: Create Build Environment
         run: cmake -E make_directory ${{github.workspace}}/build
 
@@ -63,9 +58,9 @@ jobs:
         run: |
           umask 022
           cmake \
+            DESTDIR=/usr \
             -DDO_RELEASE_BUILD=ON \
             -DNO_MESSING_WITH_FLAGS=ON \
-            -DEXEC_PREFIX=/usr \
             $GITHUB_WORKSPACE
 
       - name: Build
@@ -90,24 +85,24 @@ jobs:
           umask 022
           make package
 
-      - name: Lintian
-        continue-on-error: true
-        working-directory: ${{github.workspace}}/build
-        shell: bash
-        run: lintian --profile debian --pedantic *.deb | less
-
-      - name: rpmlint
+      - name: LintianAndRpmLint
         continue-on-error: true
         working-directory: ${{github.workspace}}/build
         shell: bash
-        run: rpmlint *.rpm | less
+        run: make package_lint
 
-      - name: Upload Brewtarget Installers
+      - name: Upload Linux Packages (Installers)
         if: ${{ success() }}
         uses: actions/upload-artifact@v2
         with:
           name: brewtarget-${{matrix.os}}
-          path: build/brewtarget*
+          path: |
+            build/brewtarget*.rpm
+            build/brewtarget*.rpm.sha256
+            build/brewtarget*.deb
+            build/brewtarget*.deb.sha256
+            build/brewtarget*.tar.bz2
+            build/brewtarget*.tar.bz2.sha256
           retention-days: 7
 
       - name: Recover Debris Artifacts

diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
@@ -48,6 +48,7 @@ jobs:
         cd build
         cmake ..
         make
+        ls -ltr
 
     - name: Prep for tests
       # If a test fails and we get a core, we'd like to analyse it.  This will be easier if we have access to the
@@ -79,14 +80,16 @@ jobs:
       run: |
         cd build
         make package
+        ls -ltr
 
-    - name: Upload Mac
+    - name: Upload Mac Packages (Installers)
       if: ${{ success() }}
       uses: actions/upload-artifact@v2
       with:
         name: brewtarget-dev-mac
         path: |
-          ${{github.workspace}}/build/brewtarget*.sh
+          ${{github.workspace}}/build/brewtarget*.dmg
+          ${{github.workspace}}/build/brewtarget*.dmg.sha256
         retention-days: 7
 
     - name: Post-processing on cores

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -33,19 +33,22 @@ jobs:
         with:
           path: temp
           fetch-depth: 0
+          submodules: recursive
 
       - uses: msys2/setup-msys2@v2
         with:
           msystem: ${{ matrix.msystem }}
           install: >-
+            mingw-w64-${{ matrix.arch }}-boost
             mingw-w64-${{ matrix.arch }}-cmake
-            mingw-w64-${{ matrix.arch }}-make
+            mingw-w64-${{ matrix.arch }}-doxygen
             mingw-w64-${{ matrix.arch }}-gcc
+            mingw-w64-${{ matrix.arch }}-libbacktrace
+            mingw-w64-${{ matrix.arch }}-make
+            mingw-w64-${{ matrix.arch }}-nsis
             mingw-w64-${{ matrix.arch }}-qt5
             mingw-w64-${{ matrix.arch }}-xalan-c
-            mingw-w64-${{ matrix.arch }}-nsis
-            mingw-w64-${{ matrix.arch }}-boost
-            mingw-w64-${{ matrix.arch }}-libbacktrace
+            mingw-w64-${{ matrix.arch }}-xerces-c
           update: true
           release: true
           path-type: strict
@@ -65,39 +68,42 @@ jobs:
       - name: CMake config
         shell: msys2 {0}
         run: |
-             cd /C/_/build
-             cp ./Locate/Include/Locate.nsh /mingw32/share/nsis/Include/
-             cp ./Locate/Plugin/locate.dll /mingw32/share/nsis/Plugins/ansi/
-             cp ./Nsislog/plugin/nsislog.dll /mingw32/share/nsis/Plugins/ansi
-             cmake .. -DCMAKE_RC_COMPILER:FILEPATH=windres.exe -G "MinGW Makefiles"
+          cd /C/_/build
+          cp ./Locate/Include/Locate.nsh /mingw32/share/nsis/Include/
+          cp ./Locate/Plugin/locate.dll /mingw32/share/nsis/Plugins/ansi/
+          cp ./Nsislog/plugin/nsislog.dll /mingw32/share/nsis/Plugins/ansi
+          cmake .. -DCMAKE_RC_COMPILER:FILEPATH=windres.exe -G "MinGW Makefiles"
 
       - name: Build
         shell: msys2 {0}
         run: |
-             cd /C/_/build
-             cmake --build .
+          cd /C/_/build
+          pwd
+          cmake --build .
 
       - name: Test
         shell: msys2 {0}
         run: |
-             cd /C/_/build
-             cmake --build . --target test
+          cd /C/_/build
+          cmake --build . --target test
 
       - name: Package
         shell: msys2 {0}
         run: |
-             cd /C/_/build
-             cmake --build . --target package
+          cd /C/_/build
+          cmake --build . --target package --verbose
 
-      - name: "Upload binaries"
+      - name: Upload Windows binaries (installers)
         if: ${{ success()}}
         uses: actions/upload-artifact@v2
         with:
           name: brewtarget-dev-${{ matrix.msystem }}
-          path: C:/_/build/brewtarget*.exe
+          path: |
+            C:/_/build/brewtarget*.exe
+            C:/_/build/brewtarget*.exe.sha256
           retention-days: 7
 
-      - name: "Upload error build"
+      - name: Upload error info from failed build
         if: ${{ failure() }}
         uses: actions/upload-artifact@v2
         with: