From 13e17c5d0fa301889f65628162c991f2bc1975fa Mon Sep 17 00:00:00 2001
From: John Haddon <thehaddonyoof@gmail.com>
Date: Fri, 2 Aug 2024 16:44:36 +0100
Subject: [PATCH 1/5] wip

---
 .github/workflows/branchCheck.yml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 .github/workflows/branchCheck.yml

diff --git a/.github/workflows/branchCheck.yml b/.github/workflows/branchCheck.yml
new file mode 100644
index 0000000000..189b46a1b8
--- /dev/null
+++ b/.github/workflows/branchCheck.yml
@@ -0,0 +1,25 @@
+name: Branch check
+on: [ push ]
+jobs:
+  check:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v3
+    - name: Check branch
+      run: |
+        import re
+
+        def version() :
+          versions = {}
+          versionRe = re.compile( r"^(gaffer.*Version.*) = (\S+)" )
+          with open( "SConstruct" ) as sconstruct :
+            for line in sconstruct.readlines() :
+            versionMatch = versionRe.match( line )
+            if versionMatch :
+              versions[versionMatch.group( 1 )] = versionMatch.group( 2 ).strip( "'\"" )
+              version = [ int( gafferMilestoneVersion ), int( gafferMajorVersion ) ]
+
+        currentVersion = version()
+        print( currentVersion )
+
+      shell: python

From fc652d08316dceaf2d39cde291f69f62230cb89e Mon Sep 17 00:00:00 2001
From: John Haddon <thehaddonyoof@gmail.com>
Date: Fri, 2 Aug 2024 16:46:32 +0100
Subject: [PATCH 2/5] wip

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

diff --git a/.github/workflows/branchCheck.yml b/.github/workflows/branchCheck.yml
index 189b46a1b8..c6c9ddd2b0 100644
--- a/.github/workflows/branchCheck.yml
+++ b/.github/workflows/branchCheck.yml
@@ -14,10 +14,10 @@ jobs:
           versionRe = re.compile( r"^(gaffer.*Version.*) = (\S+)" )
           with open( "SConstruct" ) as sconstruct :
             for line in sconstruct.readlines() :
-            versionMatch = versionRe.match( line )
-            if versionMatch :
-              versions[versionMatch.group( 1 )] = versionMatch.group( 2 ).strip( "'\"" )
-              version = [ int( gafferMilestoneVersion ), int( gafferMajorVersion ) ]
+              versionMatch = versionRe.match( line )
+              if versionMatch :
+                versions[versionMatch.group( 1 )] = versionMatch.group( 2 ).strip( "'\"" )
+                version = [ int( gafferMilestoneVersion ), int( gafferMajorVersion ) ]
 
         currentVersion = version()
         print( currentVersion )

From 1546fcb6ac3e8644e00b6610781bc730cc988fe9 Mon Sep 17 00:00:00 2001
From: John Haddon <thehaddonyoof@gmail.com>
Date: Fri, 2 Aug 2024 16:51:37 +0100
Subject: [PATCH 3/5] wip

---
 .github/workflows/branchCheck.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/branchCheck.yml b/.github/workflows/branchCheck.yml
index c6c9ddd2b0..ff76fdf121 100644
--- a/.github/workflows/branchCheck.yml
+++ b/.github/workflows/branchCheck.yml
@@ -10,6 +10,7 @@ jobs:
         import re
 
         def version() :
+
           versions = {}
           versionRe = re.compile( r"^(gaffer.*Version.*) = (\S+)" )
           with open( "SConstruct" ) as sconstruct :
@@ -17,7 +18,8 @@ jobs:
               versionMatch = versionRe.match( line )
               if versionMatch :
                 versions[versionMatch.group( 1 )] = versionMatch.group( 2 ).strip( "'\"" )
-                version = [ int( gafferMilestoneVersion ), int( gafferMajorVersion ) ]
+
+          return [ int( versions["gafferMilestoneVersion"] ), int( versions["gafferMajorVersion"] ) ]
 
         currentVersion = version()
         print( currentVersion )

From 89b519bfef9bc072e4a707d2fa594b55c33fe2db Mon Sep 17 00:00:00 2001
From: John Haddon <thehaddonyoof@gmail.com>
Date: Fri, 2 Aug 2024 16:56:12 +0100
Subject: [PATCH 4/5] wip

---
 .github/workflows/branchCheck.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/branchCheck.yml b/.github/workflows/branchCheck.yml
index ff76fdf121..7306f81b3d 100644
--- a/.github/workflows/branchCheck.yml
+++ b/.github/workflows/branchCheck.yml
@@ -4,7 +4,7 @@ jobs:
   check:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Check branch
       run: |
         import re
@@ -24,4 +24,6 @@ jobs:
         currentVersion = version()
         print( currentVersion )
 
+        print( os.environ )
+
       shell: python

From fe1a53e3d8d1b601a6b1268802d473b07ed309fa Mon Sep 17 00:00:00 2001
From: John Haddon <thehaddonyoof@gmail.com>
Date: Fri, 2 Aug 2024 16:56:43 +0100
Subject: [PATCH 5/5] wip

---
 .github/workflows/branchCheck.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/branchCheck.yml b/.github/workflows/branchCheck.yml
index 7306f81b3d..e6a090cfa7 100644
--- a/.github/workflows/branchCheck.yml
+++ b/.github/workflows/branchCheck.yml
@@ -7,6 +7,7 @@ jobs:
     - uses: actions/checkout@v4
     - name: Check branch
       run: |
+        import os
         import re
 
         def version() :