From d11ea7a98472fa05792fbc5e8def26dafa2408e1 Mon Sep 17 00:00:00 2001
From: b-s-code <89502375+b-s-code@users.noreply.github.com>
Date: Thu, 2 Oct 2025 11:26:30 +0800
Subject: [PATCH 1/2] Add newer build-and-deploy YAML file.

This is so that we can leverage GitHub's runners to make a macOS 15
build of OpenMalaria v46.0.
---
 .github/workflows/build-and-deploy.yml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
index 8aeab6d61..6f39d7e47 100644
--- a/.github/workflows/build-and-deploy.yml
+++ b/.github/workflows/build-and-deploy.yml
@@ -43,18 +43,21 @@ jobs:
       matrix:
         # os: [] #for testing with act
         include:
-          - os: ubuntu-22.04
+          - os: ubuntu-24.04
             compiler: g++
             target: Linux
 
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             compiler: g++
             target: Linux
-          
-          - os: macos-12
+
+          - os: macos-15
             compiler: clang
           
-          - os: macos-11
+          - os: macos-14
+            compiler: clang
+
+          - os: macos-13
             compiler: clang
           
     steps:
@@ -69,7 +72,7 @@ jobs:
       - name: Install - MacOS
         if: startsWith(matrix.os,'macos')
         run: |
-          HOMEBREW_NO_AUTO_UPDATE=1 brew install git coreutils cmake gcc gsl xerces-c xsd || true
+          HOMEBREW_NO_AUTO_UPDATE=1 brew install coreutils gsl xerces-c xsd || true
           HOMEBREW_NO_AUTO_UPDATE=1 brew link --overwrite xsd
       
       - name: Infos
@@ -109,4 +112,4 @@ jobs:
           asset_path: ./openMalaria-${{matrix.os}}.tar.gz
           asset_name: openMalaria-${{matrix.os}}.tar.gz
           asset_content_type: application/zip
-     
\ No newline at end of file
+     

From 836e49f062617f80d8c61ee5f39383c5eea13230 Mon Sep 17 00:00:00 2001
From: b-s-code <89502375+b-s-code@users.noreply.github.com>
Date: Thu, 2 Oct 2025 11:38:19 +0800
Subject: [PATCH 2/2] Remove offending line in cmakelists causing build
 failure.

---
 CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index da40dd62d..73abdff0d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,6 @@
 # Copyright © 2005-2013 Swiss Tropical Institute and Liverpool School Of Tropical Medicine
 # Licence: GNU General Public Licence version 2 or later (see COPYING)
 
-cmake_minimum_required (VERSION 3.0)
 
 project (OpenMalaria CXX)