build: Tests for Windows and OSX

.github/workflows/_build_and_package.yml

@@ -58,29 +58,3 @@ jobs:
         conanHash: ${{ inputs.conanHash }}
         osxTargetDeploymentVersion: ${{ inputs.osxTargetDeploymentVersion }}
 
-  BuildLinux:
-    strategy:
-      fail-fast: false
-      matrix:
-        target: [ dissolve, dissolve-gui ]
-    runs-on: ubuntu-latest
-    steps:
-    - name: 'Download Source Tarfiles'
-      uses: actions/download-artifact@v4
-      with:
-        name: source
-
-    - name: 'Unpack Source'
-      shell: bash
-      run: tar -xvf dissolve-versioned-source.tar
-
-    - name: "Build, Test, Package (Linux, ${{ matrix.target }})"
-      uses: "./.github/workflows/build"
-      with:
-        target: ${{ matrix.target }}
-        currentVersion: ${{ inputs.currentVersion }}
-        nixHash: ${{ inputs.nixHash }}
-        benchmark: ${{ inputs.benchmark }}
-        publishBenchmarks: ${{ inputs.publishBenchmarks }}
-        osxTargetDeploymentVersion: ${{ inputs.osxTargetDeploymentVersion }}
-

.github/workflows/build/osx/action.yml

@@ -173,13 +173,22 @@ runs:
 
       # Build
       mkdir build && cd build
-      cmake -G Ninja -DGUI:bool=true -DMULTI_THREADING:bool=${{ inputs.threading }} -DCONAN_GSL="OFF" -DJava_JAVA_EXECUTABLE:path=${JAVA_RUNTIME} -DANTLR_EXECUTABLE:string=$ANTLR_EXE -DQT_BASE_DIR=$QT_BASE_DIR ../ -DCMAKE_OSX_DEPLOYMENT_TARGET=${{ inputs.targetDeploymentVersion }}
+      cmake -G Ninja -DGUI:bool=true -DMULTI_THREADING:bool=${{ inputs.threading }} -DCONAN_GSL="OFF" -DJava_JAVA_EXECUTABLE:path=${JAVA_RUNTIME} -DANTLR_EXECUTABLE:string=$ANTLR_EXE -DQT_BASE_DIR=$QT_BASE_DIR ../ -DCMAKE_OSX_DEPLOYMENT_TARGET=${{ inputs.targetDeploymentVersion }} -DBUILD_TESTS:bool=true
       cmake --build . --config Release
 
       # Copy over gsl libs so we can ship them with the bundle. Our exe is only linked to two of the four libs present, and this breaks the binary if we don't include them all in the package.
       mkdir gsl
       cp -v $(brew --prefix gsl)/lib/*.dylib ./gsl
 
+  - name: Test
+    if: ${{ inputs.cacheOnly == 'false' }}
+    shell: bash
+    run: |
+      set -ex
+      cd build
+
+      ctest
+
   - name: Upload Raw Build Artifacts
     if: ${{ inputs.cacheOnly == 'false' }}
     uses: actions/upload-artifact@v4

.github/workflows/build/windows/action.yml

@@ -170,17 +170,36 @@ runs:
       JAVA_EXE="${JAVA_HOME_21_X64}\bin\java.exe"
 
       # Build
+      df -mh .
       mkdir build && cd build
       TEMPD=$(mktemp -d)
       mkdir -p $TEMPD/bin
-      cmake ../ -G Ninja -DCMAKE_BUILD_TYPE:STRING="Release" -DCMAKE_C_COMPILER=cl -DANTLR_EXECUTABLE:string=$ANTLR_EXE -DJava_JAVA_EXECUTABLE:string=$JAVA_EXE -DCMAKE_CXX_COMPILER=cl -DMULTI_THREADING:bool=${{ inputs.threading }} -DGUI:bool=true -DCMAKE_INSTALL_PREFIX:PATH=$TEMPD
+      cmake ../ -G Ninja -DCMAKE_BUILD_TYPE:STRING="Release" -DCMAKE_C_COMPILER=cl -DANTLR_EXECUTABLE:string=$ANTLR_EXE -DJava_JAVA_EXECUTABLE:string=$JAVA_EXE -DCMAKE_CXX_COMPILER=cl -DMULTI_THREADING:bool=${{ inputs.threading }} -DGUI:bool=true -DCMAKE_INSTALL_PREFIX:PATH=$TEMPD -DBUILD_TESTS:bool=true
       cmake --build . --config Release --target keywordWidgets
-      cmake --build . --config Release
+      cmake --build . --config Release --target Dissolve Dissolve-GUI-QML
+      cmake --build . --config Release --target Dissolve-GUI-QML
       cp bin/* $TEMPD/bin
       ninja install
       mkdir -p install
       cp -r $TEMPD/* install/
 
+  - name: Test
+    if: ${{ inputs.cacheOnly == 'false' }}
+    shell: bash
+    run: |
+      df -mh .
+      Qt6_DIR="${RUNNER_TEMP}\qt\${{ inputs.qtVersion }}\msvc2019_64"
+      ANTLR_EXE="${RUNNER_TEMP}\antlr-${{ inputs.antlrVersion }}-complete.jar"
+      export PATH="${Qt6_DIR}\bin;$PATH"
+      INCLUDE="${RUNNER_TEMP}\freetype-latest;$INCLUDE"
+      LIB="${RUNNER_TEMP}\freetype-install\lib;${RUNNER_TEMP}\freetype-install\bin;$LIB"
+      INCLUDE="${RUNNER_TEMP}\ftgl-latest\src;$INCLUDE"
+      LIB="${RUNNER_TEMP}\ftgl-install\lib;$LIB"
+      JAVA_EXE="${JAVA_HOME_21_X64}\bin\java.exe"
+      cd build
+      cmake --build . --config Release
+      ctest
+
   - name: Upload Raw Build Artifacts
     if: ${{ inputs.cacheOnly == 'false' }}
     uses: actions/upload-artifact@v4

.github/workflows/pr.yml

@@ -25,14 +25,8 @@ jobs:
     with:
       checkoutRef: ${{ github.event.pull_request.head.sha }}
 
-  QC:
-    needs: [Checkout]
-    uses: "./.github/workflows/_qc.yml"
-    with:
-      nixHash: ${{ needs.Checkout.outputs.nixHash }}
-
   BuildAndPackage:
-    needs: [Checkout]
+    needs: Checkout
     uses: "./.github/workflows/_build_and_package.yml"
     with:
       benchmark: true
@@ -51,11 +45,3 @@ jobs:
     with:
       branch: 'refs/pull/${{ github.event.pull_request.number }}/merge'
 
-  Web:
-    needs: [Checkout]
-    uses: "./.github/workflows/_website.yml"
-    with:
-      publishType: 'none'
-      displayMajorVersion: ${{ needs.Checkout.outputs.currentVersionMajor }}
-      displayMinorVersion: ${{ needs.Checkout.outputs.currentVersionMinor }}
-      hugoVersion: ${{ needs.Checkout.outputs.hugoVersion }}