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 + 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)