From f9cc4c6c94bdf40a4133872901b282f856ff2c59 Mon Sep 17 00:00:00 2001 From: Tristan Youngs Date: Wed, 29 Oct 2025 11:28:42 +0000 Subject: [PATCH 1/7] REMOVE Windows and Mac only. --- .github/workflows/_build_and_package.yml | 26 ------------------------ .github/workflows/pr.yml | 15 -------------- 2 files changed, 41 deletions(-) diff --git a/.github/workflows/_build_and_package.yml b/.github/workflows/_build_and_package.yml index 548959f991..6e3612d54c 100644 --- a/.github/workflows/_build_and_package.yml +++ b/.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 }} - diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 4088cc6a9b..cb794b44cb 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -25,14 +25,7 @@ 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] uses: "./.github/workflows/_build_and_package.yml" with: benchmark: false @@ -51,11 +44,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 }} From 200c30ae2213f4ce215a544af39cfc8270e800ca Mon Sep 17 00:00:00 2001 From: Tristan Youngs Date: Wed, 29 Oct 2025 11:34:56 +0000 Subject: [PATCH 2/7] Dump attempt at building tests. --- .github/workflows/build/osx/action.yml | 9 +++++++++ .github/workflows/build/windows/action.yml | 9 ++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build/osx/action.yml b/.github/workflows/build/osx/action.yml index 78e23117b4..c4f54b9090 100644 --- a/.github/workflows/build/osx/action.yml +++ b/.github/workflows/build/osx/action.yml @@ -193,6 +193,15 @@ runs: 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 diff --git a/.github/workflows/build/windows/action.yml b/.github/workflows/build/windows/action.yml index 6d05f4ef1e..b01131ce40 100644 --- a/.github/workflows/build/windows/action.yml +++ b/.github/workflows/build/windows/action.yml @@ -172,13 +172,20 @@ runs: mkdir -p 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 cp bin/* $TEMPD/bin ninja install mkdir -p install cp -r $TEMPD/* install/ + - name: Test + if: ${{ inputs.cacheOnly == 'false' }} + shell: bash + run: | + cd build + ctest + - name: Upload Raw Build Artifacts if: ${{ inputs.cacheOnly == 'false' }} uses: actions/upload-artifact@v4 From 83210a6cdff2729d642ceb73533b997fa93d6f28 Mon Sep 17 00:00:00 2001 From: Tristan Youngs Date: Wed, 29 Oct 2025 11:43:16 +0000 Subject: [PATCH 3/7] REMOVE Fix. --- .github/workflows/pr.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index cb794b44cb..8191539854 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -26,6 +26,7 @@ jobs: checkoutRef: ${{ github.event.pull_request.head.sha }} BuildAndPackage: + needs: Checkout uses: "./.github/workflows/_build_and_package.yml" with: benchmark: false From 3fd767d4f7678573369120ec105906f4ac9181ab Mon Sep 17 00:00:00 2001 From: Tristan Youngs Date: Wed, 29 Oct 2025 12:00:26 +0000 Subject: [PATCH 4/7] Huh? --- .github/workflows/build/windows/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build/windows/action.yml b/.github/workflows/build/windows/action.yml index b01131ce40..a755f5070e 100644 --- a/.github/workflows/build/windows/action.yml +++ b/.github/workflows/build/windows/action.yml @@ -179,6 +179,7 @@ runs: mkdir -p install cp -r $TEMPD/* install/ + - name: Test if: ${{ inputs.cacheOnly == 'false' }} shell: bash From da544cbdd84e21fe0d11a347c5dfd63663738abd Mon Sep 17 00:00:00 2001 From: Tristan Youngs Date: Wed, 29 Oct 2025 12:13:26 +0000 Subject: [PATCH 5/7] The mystery is solved. --- .github/workflows/build/windows/action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build/windows/action.yml b/.github/workflows/build/windows/action.yml index a755f5070e..b01131ce40 100644 --- a/.github/workflows/build/windows/action.yml +++ b/.github/workflows/build/windows/action.yml @@ -179,7 +179,6 @@ runs: mkdir -p install cp -r $TEMPD/* install/ - - name: Test if: ${{ inputs.cacheOnly == 'false' }} shell: bash From 8e607993c0d0be3f50f9fdf5f29335cf832403be Mon Sep 17 00:00:00 2001 From: Tristan Youngs Date: Wed, 19 Nov 2025 11:03:30 +0000 Subject: [PATCH 6/7] Split things up. --- .github/workflows/build/windows/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build/windows/action.yml b/.github/workflows/build/windows/action.yml index b01131ce40..957df31221 100644 --- a/.github/workflows/build/windows/action.yml +++ b/.github/workflows/build/windows/action.yml @@ -184,6 +184,7 @@ runs: shell: bash run: | cd build + cmake --build . --config Release ctest - name: Upload Raw Build Artifacts From c497c8fd63a5848b983ac0a98aa5e139badfcb17 Mon Sep 17 00:00:00 2001 From: Tristan Youngs Date: Wed, 19 Nov 2025 16:09:01 +0000 Subject: [PATCH 7/7] Disk space check, set env. --- .github/workflows/build/windows/action.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/build/windows/action.yml b/.github/workflows/build/windows/action.yml index 957df31221..e80ee23221 100644 --- a/.github/workflows/build/windows/action.yml +++ b/.github/workflows/build/windows/action.yml @@ -183,6 +183,15 @@ runs: 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