From 04c1a99a449cd66d52a26aa86e43a80a13e97d7f Mon Sep 17 00:00:00 2001
From: Eivind Jahren <ejah@equinor.com>
Date: Tue, 23 Apr 2024 09:18:04 +0200
Subject: [PATCH] Fix github actions to macos-latest=macos-14

---
 .github/workflows/testing.yml | 16 +++++++++++-----
 .github/workflows/windows.yml | 34 ----------------------------------
 2 files changed, 11 insertions(+), 39 deletions(-)
 delete mode 100644 .github/workflows/windows.yml

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 5662960ac..909bf2cca 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -1,6 +1,12 @@
 name: testing
 
-on: [push, pull_request]
+on:
+ push:
+   branches:
+     - main
+     - 'version-**'
+   tags: "*"
+ pull_request:
 
 jobs:
   build-test-cmake:
@@ -9,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ['ubuntu-latest', 'macos-latest', 'macos-latest-xlarge']
+        os: ['ubuntu-latest', 'macos-13', 'macos-latest']
 
     runs-on: ${{ matrix.os }}
 
@@ -53,12 +59,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ['ubuntu-latest', 'macos-latest', 'macos-latest-xlarge']
+        os: ['ubuntu-latest', 'macos-13', 'macos-latest']
         python: ['3.8', '3.9', '3.10', '3.11', '3.12']
         exclude:
-          - os: macos-latest-xlarge
+          - os: macos-latest
             python: '3.8'
-          - os: macos-latest-xlarge
+          - os: macos-latest
             python: '3.9'
 
     runs-on: ${{ matrix.os }}
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
deleted file mode 100644
index 7262c0f6f..000000000
--- a/.github/workflows/windows.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: Windows Compile
-
-on: [push, pull_request]
-
-jobs:
-  build-cmake:
-    name: CMake
-
-    strategy:
-      fail-fast: false
-      matrix:
-        os: ['windows-latest']
-
-    runs-on: ${{ matrix.os }}
-
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        # required for `git describe --tags` to work
-        fetch-depth: 0
-
-    - name: Setup Python
-      uses: actions/setup-python@v2
-      with:
-        python-version: '3.x'
-
-    - name: Install dependencies
-      run: pip install "conan<2"
-
-    - name: Build ecl
-      run: |
-        mkdir cmake-build
-        cmake -S . -B cmake-build
-        cmake --build cmake-build --config Release