CI fixes (#161)

* actions/checkout@v4 on Windows * actions/checkout@v4 on macOS * actions/checkout@v4 on Ubuntu * Added macOS 14 for testing too * Disabled OpenCL tests on Ubuntu until we can find a fix * Typo in Ubuntu build * Turned off macOS 14 build pending fixes (HDF5 not found by CMake) * Remove --rerun-failed in case was causing unexpected test runs * More cache@v4 * Test adding -${{env.WXVERSION}} to wxWidgets cache key * Reverted use of ${{env..}} in yaml labels, didn't work * macOS: Unlink 2to3 before installing python3 * macOS: More unlink fixes * macOS: yaml syntax error * Windows: turned off testing on windows-2019 because of intermittent failures (symbol not found) * Ubuntu: remove --rerun-failed even on commented-out line * macOS: rm more links
GollyGang · Feb 13, 2024 · bc6f859 · bc6f859
1 parent bce45ff
commit bc6f859
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 16 deletions.
diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml
@@ -20,7 +20,15 @@ jobs:
     steps:
 
     - name: git clone
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
+
+    - name: Remove links before installing python3, else get brew install errors sometimes
+      run: |
+        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: |

diff --git a/.github/workflows/build_ubuntu.yml b/.github/workflows/build_ubuntu.yml
@@ -23,12 +23,12 @@ jobs:
     steps:
 
     - name: git clone
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - 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
+      # 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
diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
@@ -16,14 +16,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2022, windows-2019]
+        os: [windows-2022]
         build_type: [Debug, Release]
     runs-on: ${{ matrix.os }}
 
     steps:
 
     - name: git clone
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Prepare Visual Studio command prompt
       uses: ilammy/msvc-dev-cmd@v1
@@ -32,30 +32,30 @@ jobs:
 
     - name: Cache wxWidgets (Release)
       if: matrix.build_type == 'Release'
-      id: cache-wxwidgets-release
+      id: cache-wxwidgets-3-2-4-release
       uses: actions/cache@v4
       with:
         path: wxWidgets-${{env.WXVERSION}}
-        key: ${{runner.os}}-build-wxWidgets-release
+        key: ${{runner.os}}-build-wxWidgets-3-2-4-release
 
     - name: Cache wxWidgets (Debug)
       if: matrix.build_type == 'Debug'
-      id: cache-wxwidgets-debug
-      uses: actions/cache@v2
+      id: cache-wxwidgets-3-2-4-debug
+      uses: actions/cache@v4
       with:
         path: wxWidgets-${{env.WXVERSION}}
-        key: ${{runner.os}}-build-wxWidgets-debug
+        key: ${{runner.os}}-build-wxWidgets-3.2.4-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-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}}
          cd wxWidgets-${{env.WXVERSION}}/build/msw
          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-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}}
@@ -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: