From 5fb49a208cd02694b6be64d44ccda2d7cb6b3b04 Mon Sep 17 00:00:00 2001
From: Tristan Youngs <tristan.youngs@stfc.ac.uk>
Date: Wed, 1 May 2024 15:37:35 +0100
Subject: [PATCH 1/2] Bump dev version to 1.6.0.

---
 CMakeLists.txt              | 2 +-
 ci/windows/dissolve-gui.iss | 4 ++--
 flake.nix                   | 2 +-
 src/main/version.cpp        | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c09f158ee..29338e01f4 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ project(Dissolve)
 set(DESCRIPTION "Dissolve")
 set(AUTHOR "Team Dissolve")
 set(VERSION_MAJOR "1")
-set(VERSION_MINOR "5")
+set(VERSION_MINOR "6")
 set(VERSION_PATCH "0")
 
 if(NOT CMAKE_BUILD_TYPE)
diff --git a/ci/windows/dissolve-gui.iss b/ci/windows/dissolve-gui.iss
index 0335a3148e..7b2b200980 100644
--- a/ci/windows/dissolve-gui.iss
+++ b/ci/windows/dissolve-gui.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Dissolve-GUI"
-#define MyAppVersion "1.5.0"
+#define MyAppVersion "1.6.0"
 #define MyAppPublisher "Team Dissolve"
 #define MyAppURL "https://www.projectdissolve.com/"
 #define MyAppExeName "Dissolve-GUI.exe"
@@ -31,7 +31,7 @@ DefaultDirName={commonpf}\Dissolve-GUI
 DefaultGroupName={#MyAppName}
 LicenseFile=..\..\LICENSE.txt
 OutputDir=..\..\
-OutputBaseFilename=Dissolve-GUI-1.5.0-Win64
+OutputBaseFilename=Dissolve-GUI-1.6.0-Win64
 SetupIconFile=Dissolve.ico
 Compression=lzma
 SolidCompression=yes
diff --git a/flake.nix b/flake.nix
index aed54999b0..9f72004137 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,7 +19,7 @@
         else
           (if gui then "dissolve-gui" else "dissolve");
       cmake-bool = x: if x then "ON" else "OFF";
-      version = "1.5.0";
+      version = "1.6.0";
       base_libs = pkgs:
         with pkgs; [
           antlr4
diff --git a/src/main/version.cpp b/src/main/version.cpp
index 8a8c98a53e..a6151d0cc2 100644
--- a/src/main/version.cpp
+++ b/src/main/version.cpp
@@ -5,7 +5,7 @@
 #include <fmt/format.h>
 #include <iostream>
 
-#define DISSOLVEVERSION "1.5.0"
+#define DISSOLVEVERSION "1.6.0"
 #define DISSOLVESHORTHASH ""
 #define DISSOLVEREPO "https://github.com/disorderedmaterials/dissolve.git"
 

From 911879dbc4dce3161ac8de4d854bbc8f21b46538 Mon Sep 17 00:00:00 2001
From: Tristan Youngs <tristan.youngs@stfc.ac.uk>
Date: Fri, 3 May 2024 09:30:57 +0100
Subject: [PATCH 2/2] Checkout PR on head SHA rather than merge commit.

---
 .github/workflows/pr.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index ac3ff860b7..e207b3de59 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -23,6 +23,8 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v4
+      with:
+        ref: ${{ github.event.pull_request.head.sha }}
     - name: Setup
       uses: "./.github/workflows/setup"
     - name: Quality Control
@@ -37,6 +39,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
       - name: Setup
         uses: "./.github/workflows/setup"
       - name: Set Short Hash
@@ -53,6 +57,8 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v4
+      with:
+        ref: ${{ github.event.pull_request.head.sha }}
     - name: Setup
       uses: "./.github/workflows/setup"
     - name: Set Short Hash
@@ -72,6 +78,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
       - name: Setup
         uses: "./.github/workflows/setup"
       - name: "Package (${{ matrix.os }})"