From a87a051f10dfae1b84eb5e967839d810aaeec605 Mon Sep 17 00:00:00 2001 From: Harald Steinlechner Date: Wed, 30 Apr 2025 09:24:31 +0200 Subject: [PATCH 1/3] trying to reactivate osx build for CI --- CMakePresets.json | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/CMakePresets.json b/CMakePresets.json index efa693f..900a71d 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -43,6 +43,26 @@ "value": "${sourceDir}/cspice/lib/cspice.a" } } + }, + { + "name": "osx-configure", + "displayName": "osx Configure", + "description": "Using compilers: C = /usr/bin/gcc, CXX = /usr/bin/g++", + "binaryDir": "${sourceDir}/out/build/${presetName}", + "cacheVariables": { + "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}", + "CMAKE_C_COMPILER": "/usr/bin/gcc", + "CMAKE_CXX_COMPILER": "/usr/bin/g++", + "CMAKE_BUILD_TYPE": "Debug", + "CSPICE_INCLUDE_DIR": { + "type": "FILEPATH", + "value": "${sourceDir}/cspice/include" + }, + "CSPICE_LIBRARY_RELEASE": { + "type": "FILEPATH", + "value": "${sourceDir}/cspice/lib/cspice.a" + } + } } ], "buildPresets": [ @@ -53,6 +73,10 @@ { "name": "linux-build", "configurePreset": "linux-configure" + }, + { + "name": "osx-build", + "configurePreset": "osx-configure" } ] } From 4e9cf375c4831d8c2d7c11a4d471032c65f1fd61 Mon Sep 17 00:00:00 2001 From: Harald Steinlechner Date: Wed, 30 Apr 2025 10:57:19 +0200 Subject: [PATCH 2/3] tried to fix osx (x64) build --- .github/workflows/cmake-multi-platform.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index cb6a30f..77032b9 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -23,7 +23,7 @@ jobs: matrix: # os: [ubuntu-latest, windows-latest, macos-latest] # os: [ubuntu-latest, windows-latest] - os: [macos-latest, ubuntu-latest, windows-latest] + os: [macos-13, ubuntu-latest, windows-latest] build_type: [Release] # c_compiler: [gcc, clang, cl] c_compiler: [gcc, cl, clang] @@ -53,10 +53,10 @@ jobs: # spice_dl_url: https://naif.jpl.nasa.gov/pub/naif/toolkit//C/MacM1_OSX_clang_64bit/packages/cspice.tar.Z # spice_zip_filename: cspice.tar.Z # spice_lib_filename: cspice.a - - os: macos-latest + - os: macos-13 c_compiler: gcc cpp_compiler: g++ - # arch: arm64 + arch: x64 spice_dl_url: https://naif.jpl.nasa.gov/pub/naif/toolkit//C/MacIntel_OSX_AppleC_64bit/packages/cspice.tar.Z spice_zip_filename: cspice.tar.Z spice_lib_filename: cspice.a @@ -93,7 +93,7 @@ jobs: - if: matrix.os == 'ubuntu-latest' run: tar -xf "${{ github.workspace }}/${{ matrix.spice_zip_filename }}" && rm "${{ github.workspace }}/${{ matrix.spice_zip_filename }}" - - if: matrix.os == 'macos-latest' + - if: matrix.os == 'macos-13' run: tar -xf "${{ github.workspace }}/${{ matrix.spice_zip_filename }}" && rm "${{ github.workspace }}/${{ matrix.spice_zip_filename }}" - name: Set reusable strings From 4330b4d8d6037f7585099fe19f8f62e6996c6da4 Mon Sep 17 00:00:00 2001 From: Harald Steinlechner Date: Wed, 30 Apr 2025 10:59:42 +0200 Subject: [PATCH 3/3] CI: excluded cl and clang for osx build --- .github/workflows/cmake-multi-platform.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 77032b9..434df7f 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -67,9 +67,9 @@ jobs: c_compiler: clang - os: ubuntu-latest c_compiler: cl - - os: macos-latest + - os: macos-13 c_compiler: cl - - os: macos-latest + - os: macos-13 c_compiler: clang runs-on: ${{ matrix.os }}