From 5089061d4778c620f344622cdacfad243329f2e9 Mon Sep 17 00:00:00 2001
From: Tim Hutton <tim.hutton@gmail.com>
Date: Mon, 12 Feb 2024 23:08:20 +0000
Subject: [PATCH 01/17] actions/checkout@v4 on Windows

---
 .github/workflows/build_windows.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
index 4581b792..cf8ae0ba 100644
--- a/.github/workflows/build_windows.yml
+++ b/.github/workflows/build_windows.yml
@@ -23,7 +23,7 @@ jobs:
     steps:
 
     - name: git clone
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Prepare Visual Studio command prompt
       uses: ilammy/msvc-dev-cmd@v1

From 04166194ac4475e88bbf387576b2fc8a15f613b5 Mon Sep 17 00:00:00 2001
From: Tim Hutton <tim.hutton@gmail.com>
Date: Mon, 12 Feb 2024 23:09:06 +0000
Subject: [PATCH 02/17] actions/checkout@v4 on macOS

---
 .github/workflows/build_macos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml
index 3aa8c54d..b1389fc9 100644
--- a/.github/workflows/build_macos.yml
+++ b/.github/workflows/build_macos.yml
@@ -20,7 +20,7 @@ jobs:
     steps:
 
     - name: git clone
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Install dependencies
       run: |

From fb29669d742cdc8a7517815ac049f5e74ca68fdf Mon Sep 17 00:00:00 2001
From: Tim Hutton <tim.hutton@gmail.com>
Date: Mon, 12 Feb 2024 23:09:24 +0000
Subject: [PATCH 03/17] actions/checkout@v4 on Ubuntu

---
 .github/workflows/build_ubuntu.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_ubuntu.yml b/.github/workflows/build_ubuntu.yml
index d757ef54..ac94f2d0 100644
--- a/.github/workflows/build_ubuntu.yml
+++ b/.github/workflows/build_ubuntu.yml
@@ -23,7 +23,7 @@ jobs:
     steps:
 
     - name: git clone
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Install dependencies
       run: |

From 1b25694cffa6e5985767c86efb2a388c9ef96486 Mon Sep 17 00:00:00 2001
From: Tim Hutton <tim.hutton@gmail.com>
Date: Mon, 12 Feb 2024 23:16:20 +0000
Subject: [PATCH 04/17] Added macOS 14 for testing too

---
 .github/workflows/build_macos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml
index b1389fc9..c0c7ba22 100644
--- a/.github/workflows/build_macos.yml
+++ b/.github/workflows/build_macos.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, macos-12]
+        os: [macos-14, macos-13, macos-12]
         build_type: [Debug, Release]
     runs-on: ${{ matrix.os }}
 

From 89731e37cbc2714f4bee450c6012166ddb86b0c4 Mon Sep 17 00:00:00 2001
From: Tim Hutton <tim.hutton@gmail.com>
Date: Mon, 12 Feb 2024 23:20:01 +0000
Subject: [PATCH 05/17] Disabled OpenCL tests on Ubuntu until we can find a fix

---
 .github/workflows/build_ubuntu.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build_ubuntu.yml b/.github/workflows/build_ubuntu.yml
index ac94f2d0..d84d8484 100644
--- a/.github/workflows/build_ubuntu.yml
+++ b/.github/workflows/build_ubuntu.yml
@@ -28,7 +28,7 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install libvtk7-dev ocl-icd-opencl-dev libgtk-3-dev libwxgtk3.0-gtk3-dev libpocl2 pocl-opencl-icd
+        sudo apt-get install libvtk7-dev ocl-icd-opencl-dev libgtk-3-dev libwxgtk3.0-gtk3-dev libpocl2
 
     - name: Create Build Environment
       run: cmake -E make_directory ${{runner.workspace}}/build
@@ -47,7 +47,8 @@ jobs:
       working-directory: ${{runner.workspace}}/build
       run: cmake --build . --config ${{matrix.build_type}}
 
-    - name: Test
+    - name: Test (without OpenCL)
       shell: bash
-      working-directory: ${{runner.workspace}}/build
-      run: ctest -C ${{matrix.build_type}} --rerun-failed --output-on-failure
+      working-directory: ${{runner.workspace}}/buildrun
+      # run: ctest -C ${{matrix.build_type}} --rerun-failed --output-on-failure # OpenCL tests (disabled for now)
+      run: ctest -R rdy -C ${{matrix.build_type}} --rerun-failed --output-on-failure

From 6efc6c2407993f231285d62aa0fa0b7b557fcb17 Mon Sep 17 00:00:00 2001
From: Tim Hutton <tim.hutton@gmail.com>
Date: Mon, 12 Feb 2024 23:34:47 +0000
Subject: [PATCH 06/17] Typo in Ubuntu build

---
 .github/workflows/build_ubuntu.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_ubuntu.yml b/.github/workflows/build_ubuntu.yml
index d84d8484..c5f39588 100644
--- a/.github/workflows/build_ubuntu.yml
+++ b/.github/workflows/build_ubuntu.yml
@@ -49,6 +49,6 @@ jobs:
 
     - name: Test (without OpenCL)
       shell: bash
-      working-directory: ${{runner.workspace}}/buildrun
+      working-directory: ${{runner.workspace}}/build
       # run: ctest -C ${{matrix.build_type}} --rerun-failed --output-on-failure # OpenCL tests (disabled for now)
       run: ctest -R rdy -C ${{matrix.build_type}} --rerun-failed --output-on-failure

From e300a6cd35e1828572947d6cf8d47994599be0b5 Mon Sep 17 00:00:00 2001
From: Tim Hutton <tim.hutton@gmail.com>
Date: Mon, 12 Feb 2024 23:37:35 +0000
Subject: [PATCH 07/17] Turned off macOS 14 build pending fixes (HDF5 not found
 by CMake)

---
 .github/workflows/build_macos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml
index c0c7ba22..b1389fc9 100644
--- a/.github/workflows/build_macos.yml
+++ b/.github/workflows/build_macos.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-14, macos-13, macos-12]
+        os: [macos-13, macos-12]
         build_type: [Debug, Release]
     runs-on: ${{ matrix.os }}
 

From 9220a0bc1959db11543f0592e8f8f0b337bb291c Mon Sep 17 00:00:00 2001
From: Tim Hutton <tim.hutton@gmail.com>
Date: Mon, 12 Feb 2024 23:51:33 +0000
Subject: [PATCH 08/17] Remove --rerun-failed in case was causing unexpected
 test runs

---
 .github/workflows/build_ubuntu.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_ubuntu.yml b/.github/workflows/build_ubuntu.yml
index c5f39588..0e0915c6 100644
--- a/.github/workflows/build_ubuntu.yml
+++ b/.github/workflows/build_ubuntu.yml
@@ -51,4 +51,4 @@ jobs:
       shell: bash
       working-directory: ${{runner.workspace}}/build
       # run: ctest -C ${{matrix.build_type}} --rerun-failed --output-on-failure # OpenCL tests (disabled for now)
-      run: ctest -R rdy -C ${{matrix.build_type}} --rerun-failed --output-on-failure
+      run: ctest -R rdy -C ${{matrix.build_type}} --output-on-failure

From 850b4c081685b8af5f8649afeceb12a3d58ab175 Mon Sep 17 00:00:00 2001
From: Tim Hutton <tim.hutton@gmail.com>
Date: Tue, 13 Feb 2024 00:02:41 +0000
Subject: [PATCH 09/17] More cache@v4

---
 .github/workflows/build_windows.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
index cf8ae0ba..01b89d49 100644
--- a/.github/workflows/build_windows.yml
+++ b/.github/workflows/build_windows.yml
@@ -41,7 +41,7 @@ jobs:
     - name: Cache wxWidgets (Debug)
       if: matrix.build_type == 'Debug'
       id: cache-wxwidgets-debug
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: wxWidgets-${{env.WXVERSION}}
         key: ${{runner.os}}-build-wxWidgets-debug
@@ -64,7 +64,7 @@ jobs:
 
     - name: Cache OpenCL
       id: cache-opencl
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       env:
         cache-name: cache-opencl
       with:
@@ -78,7 +78,7 @@ jobs:
 
     - name: Cache VTK
       id: cache-vtk
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       env:
         cache-name: cache-vtk
       with:

From 84bfdce6eb59dbdf1536fbb94b844adf2267b03a Mon Sep 17 00:00:00 2001
From: Tim Hutton <tim.hutton@gmail.com>
Date: Tue, 13 Feb 2024 00:08:37 +0000
Subject: [PATCH 10/17] Test adding -${{env.WXVERSION}} to wxWidgets cache key

---
 .github/workflows/build_windows.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
index 01b89d49..04125dac 100644
--- a/.github/workflows/build_windows.yml
+++ b/.github/workflows/build_windows.yml
@@ -32,22 +32,22 @@ jobs:
 
     - name: Cache wxWidgets (Release)
       if: matrix.build_type == 'Release'
-      id: cache-wxwidgets-release
+      id: cache-wxwidgets-${{env.WXVERSION}}-release
       uses: actions/cache@v4
       with:
         path: wxWidgets-${{env.WXVERSION}}
-        key: ${{runner.os}}-build-wxWidgets-release
+        key: ${{runner.os}}-build-wxWidgets-${{env.WXVERSION}}-release
 
     - name: Cache wxWidgets (Debug)
       if: matrix.build_type == 'Debug'
-      id: cache-wxwidgets-debug
+      id: cache-wxwidgets-${{env.WXVERSION}}-debug
       uses: actions/cache@v4
       with:
         path: wxWidgets-${{env.WXVERSION}}
-        key: ${{runner.os}}-build-wxWidgets-debug
+        key: ${{runner.os}}-build-wxWidgets-${{env.WXVERSION}}-debug
 
     - name: Compile wxWidgets (Release)
-      if: matrix.build_type == 'Release' && steps.cache-wxwidgets-release.outputs.cache-hit != 'true'
+      if: matrix.build_type == 'Release' && steps.cache-wxwidgets-${{env.WXVERSION}}-release.outputs.cache-hit != 'true'
       run: |
          Invoke-WebRequest -Uri https://github.com/wxWidgets/wxWidgets/releases/download/v${{env.WXVERSION}}/wxWidgets-${{env.WXVERSION}}.zip -OutFile wxWidgets-${{env.WXVERSION}}.zip
          Expand-Archive -LiteralPath wxWidgets-${{env.WXVERSION}}.zip -DestinationPath wxWidgets-${{env.WXVERSION}}
@@ -55,7 +55,7 @@ jobs:
          nmake -C -f makefile.vc BUILD=release RUNTIME_LIBS=static UNICODE=1 DEBUG_INFO=0 DEBUG_FLAG=0
 
     - name: Compile wxWidgets (Debug)
-      if: matrix.build_type == 'Debug' && steps.cache-wxwidgets-debug.outputs.cache-hit != 'true'
+      if: matrix.build_type == 'Debug' && steps.cache-wxwidgets-${{env.WXVERSION}}-debug.outputs.cache-hit != 'true'
       run: |
          Invoke-WebRequest -Uri https://github.com/wxWidgets/wxWidgets/releases/download/v${{env.WXVERSION}}/wxWidgets-${{env.WXVERSION}}.zip -OutFile wxWidgets-${{env.WXVERSION}}.zip
          Expand-Archive -LiteralPath wxWidgets-${{env.WXVERSION}}.zip -DestinationPath wxWidgets-${{env.WXVERSION}}

From 932036691e5e5100a98a803b295071a6ebf71855 Mon Sep 17 00:00:00 2001
From: Tim Hutton <tim.hutton@gmail.com>
Date: Tue, 13 Feb 2024 00:14:25 +0000
Subject: [PATCH 11/17] Reverted use of ${{env..}} in yaml labels, didn't work

---
 .github/workflows/build_windows.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
index 04125dac..7235a435 100644
--- a/.github/workflows/build_windows.yml
+++ b/.github/workflows/build_windows.yml
@@ -32,22 +32,22 @@ jobs:
 
     - name: Cache wxWidgets (Release)
       if: matrix.build_type == 'Release'
-      id: cache-wxwidgets-${{env.WXVERSION}}-release
+      id: cache-wxwidgets-3-2-4-release
       uses: actions/cache@v4
       with:
         path: wxWidgets-${{env.WXVERSION}}
-        key: ${{runner.os}}-build-wxWidgets-${{env.WXVERSION}}-release
+        key: ${{runner.os}}-build-wxWidgets-3-2-4-release
 
     - name: Cache wxWidgets (Debug)
       if: matrix.build_type == 'Debug'
-      id: cache-wxwidgets-${{env.WXVERSION}}-debug
+      id: cache-wxwidgets-3-2-4-debug
       uses: actions/cache@v4
       with:
         path: wxWidgets-${{env.WXVERSION}}
-        key: ${{runner.os}}-build-wxWidgets-${{env.WXVERSION}}-debug
+        key: ${{runner.os}}-build-wxWidgets-3.2.4-debug
 
     - name: Compile wxWidgets (Release)
-      if: matrix.build_type == 'Release' && steps.cache-wxwidgets-${{env.WXVERSION}}-release.outputs.cache-hit != 'true'
+      if: matrix.build_type == 'Release' && steps.cache-wxwidgets-3-2-4-release.outputs.cache-hit != 'true'
       run: |
          Invoke-WebRequest -Uri https://github.com/wxWidgets/wxWidgets/releases/download/v${{env.WXVERSION}}/wxWidgets-${{env.WXVERSION}}.zip -OutFile wxWidgets-${{env.WXVERSION}}.zip
          Expand-Archive -LiteralPath wxWidgets-${{env.WXVERSION}}.zip -DestinationPath wxWidgets-${{env.WXVERSION}}
@@ -55,7 +55,7 @@ jobs:
          nmake -C -f makefile.vc BUILD=release RUNTIME_LIBS=static UNICODE=1 DEBUG_INFO=0 DEBUG_FLAG=0
 
     - name: Compile wxWidgets (Debug)
-      if: matrix.build_type == 'Debug' && steps.cache-wxwidgets-${{env.WXVERSION}}-debug.outputs.cache-hit != 'true'
+      if: matrix.build_type == 'Debug' && steps.cache-wxwidgets-3-2-4-debug.outputs.cache-hit != 'true'
       run: |
          Invoke-WebRequest -Uri https://github.com/wxWidgets/wxWidgets/releases/download/v${{env.WXVERSION}}/wxWidgets-${{env.WXVERSION}}.zip -OutFile wxWidgets-${{env.WXVERSION}}.zip
          Expand-Archive -LiteralPath wxWidgets-${{env.WXVERSION}}.zip -DestinationPath wxWidgets-${{env.WXVERSION}}

From 66a52ee2749a61bf8f0954276bb92012b6223ff0 Mon Sep 17 00:00:00 2001
From: Tim Hutton <tim.hutton@gmail.com>
Date: Tue, 13 Feb 2024 00:32:39 +0000
Subject: [PATCH 12/17] macOS: Unlink 2to3 before installing python3

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

diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml
index b1389fc9..b7abfd7d 100644
--- a/.github/workflows/build_macos.yml
+++ b/.github/workflows/build_macos.yml
@@ -22,6 +22,9 @@ jobs:
     - name: git clone
       uses: actions/checkout@v4
 
+    - name: Unlink 2to3 before installing python3
+      run: rm '/usr/local/bin/2to3-3.12'
+
     - name: Install dependencies
       run: |
         brew install vtk wxmac

From 5c9634acf0591eec87c5e8a975fdfe9636480e09 Mon Sep 17 00:00:00 2001
From: Tim Hutton <tim.hutton@gmail.com>
Date: Tue, 13 Feb 2024 00:41:12 +0000
Subject: [PATCH 13/17] macOS: More unlink fixes

---
 .github/workflows/build_macos.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml
index b7abfd7d..d4e918d0 100644
--- a/.github/workflows/build_macos.yml
+++ b/.github/workflows/build_macos.yml
@@ -22,8 +22,11 @@ jobs:
     - name: git clone
       uses: actions/checkout@v4
 
-    - name: Unlink 2to3 before installing python3
-      run: rm '/usr/local/bin/2to3-3.12'
+    - name: Workaround: Remove links before installing python3
+      run: |
+        rm '/usr/local/bin/2to3-3.12'
+        rm '/usr/local/bin/2to3'
+        rm '/usr/local/bin/idle3.12'
 
     - name: Install dependencies
       run: |

From 464c6ab6160035a9b501bdb922fdef881fcefbdf Mon Sep 17 00:00:00 2001
From: Tim Hutton <tim.hutton@gmail.com>
Date: Tue, 13 Feb 2024 00:45:45 +0000
Subject: [PATCH 14/17] macOS: yaml syntax error

---
 .github/workflows/build_macos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml
index d4e918d0..c46bf048 100644
--- a/.github/workflows/build_macos.yml
+++ b/.github/workflows/build_macos.yml
@@ -22,7 +22,7 @@ jobs:
     - name: git clone
       uses: actions/checkout@v4
 
-    - name: Workaround: Remove links before installing python3
+    - name: Remove links before installing python3
       run: |
         rm '/usr/local/bin/2to3-3.12'
         rm '/usr/local/bin/2to3'

From 29eeed5eee79608bab8e05c8b3990c70c0658977 Mon Sep 17 00:00:00 2001
From: Tim Hutton <tim.hutton@gmail.com>
Date: Tue, 13 Feb 2024 00:52:58 +0000
Subject: [PATCH 15/17] Windows: turned off testing on windows-2019 because of
 intermittent failures (symbol not found)

---
 .github/workflows/build_windows.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
index 7235a435..cec159d2 100644
--- a/.github/workflows/build_windows.yml
+++ b/.github/workflows/build_windows.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2022, windows-2019]
+        os: [windows-2022]
         build_type: [Debug, Release]
     runs-on: ${{ matrix.os }}
 

From 4c082372a4085ea451cb0297ffdb55d484ff2201 Mon Sep 17 00:00:00 2001
From: Tim Hutton <tim.hutton@gmail.com>
Date: Tue, 13 Feb 2024 00:55:02 +0000
Subject: [PATCH 16/17] Ubuntu: remove --rerun-failed even on commented-out
 line

---
 .github/workflows/build_ubuntu.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_ubuntu.yml b/.github/workflows/build_ubuntu.yml
index 0e0915c6..5229a155 100644
--- a/.github/workflows/build_ubuntu.yml
+++ b/.github/workflows/build_ubuntu.yml
@@ -50,5 +50,5 @@ jobs:
     - name: Test (without OpenCL)
       shell: bash
       working-directory: ${{runner.workspace}}/build
-      # run: ctest -C ${{matrix.build_type}} --rerun-failed --output-on-failure # OpenCL tests (disabled for now)
+      # run: ctest -C ${{matrix.build_type}} --output-on-failure # OpenCL tests (disabled for now)
       run: ctest -R rdy -C ${{matrix.build_type}} --output-on-failure

From e36f67ba768173070bdf97e6d0ea562aba1b00be Mon Sep 17 00:00:00 2001
From: Tim Hutton <tim.hutton@gmail.com>
Date: Tue, 13 Feb 2024 01:06:54 +0000
Subject: [PATCH 17/17] macOS: rm more links

---
 .github/workflows/build_macos.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml
index c46bf048..81bc46be 100644
--- a/.github/workflows/build_macos.yml
+++ b/.github/workflows/build_macos.yml
@@ -22,11 +22,13 @@ jobs:
     - name: git clone
       uses: actions/checkout@v4
 
-    - name: Remove links before installing python3
+    - name: Remove links before installing python3, else get brew install errors sometimes
       run: |
-        rm '/usr/local/bin/2to3-3.12'
         rm '/usr/local/bin/2to3'
+        rm '/usr/local/bin/2to3-3.11'
+        rm '/usr/local/bin/2to3-3.12'
         rm '/usr/local/bin/idle3.12'
+        rm '/usr/local/bin/pydoc3.12'
 
     - name: Install dependencies
       run: |