Skip to content

Commit

Permalink
ci: macos: update GCC version. Simplify presets.
Browse files Browse the repository at this point in the history
GCC-11 is being removed from GitHub Actions macOS runners in a few weeks

actions/runner-images#10213
  • Loading branch information
scivision committed Jul 22, 2024
1 parent 80b20ac commit c9bd8e5
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 161 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/ci_cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,7 @@ jobs:
name: CMake build on MacOS
env:
HOMEBREW_NO_INSTALL_CLEANUP: 1
CC: gcc-11
CXX: g++-11
FC: gfortran-11
FC: gfortran-14

steps:
- uses: actions/checkout@v4
Expand Down
56 changes: 2 additions & 54 deletions CMakePresets.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
{
"version": 2,
"cmakeMinimumRequired": {
"major": 3,
"minor": 20,
"patch": 0
},
"version": 4,

"configurePresets": [
{
"name": "ci",
"binaryDir": "${sourceDir}/build",
"generator": "Ninja",
"environment": {
"CUDAARCHS": "72",
"CFLAGS": "-DFCLAW_ENABLE_DEBUG",
Expand All @@ -23,7 +17,6 @@
{
"name": "default",
"binaryDir": "${sourceDir}/build",
"generator": "Ninja",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release",
"mpi": true,
Expand All @@ -36,53 +29,8 @@
"cacheVariables": {"openmp": false},
"environment": {
"CMAKE_BUILD_TYPE": "RelWithDebInfo",
"CC": "gcc-11",
"CFLAGS": "-DFCLAW_ENABLE_DEBUG",
"CXX": "g++-11",
"CXXFLAGS": "-DFCLAW_ENABLE_DEBUG",
"FC": "gfortran-11"
}
},
{
"name": "makemac", "inherits": ["make", "mac"],
"displayName": "MacOS with Make",
"description": "MacOS: OpenMP not used, using Make"
},
{
"name": "make", "inherits": "default",
"displayName": "build with GNU Make",
"generator": "Unix Makefiles"
},
{
"name": "makewin", "inherits": "default",
"displayName": "build with GNU Make: Windows",
"generator": "MinGW Makefiles"
},
{
"name": "intel", "inherits": "default",
"displayName": "Intel Classic compiler: Linux/MacOS",
"environment": {
"CC": "icc",
"CXX": "icpc",
"FC": "ifort",
"MPI_ROOT": "$env{I_MPI_ROOT}"
}
},
{
"name": "intelwin", "inherits": "intel",
"displayName": "Intel Classic compiler: Windows",
"environment": {
"CC": "icl",
"CXX": "icl"
}
},
{
"name": "intelnext", "inherits": "intel",
"displayName": "Intel oneAPI LLVM",
"environment": {
"CC": "icx",
"CXX": "icx",
"FC": "ifx"
"CXXFLAGS": "-DFCLAW_ENABLE_DEBUG"
}
}
],
Expand Down
106 changes: 2 additions & 104 deletions applications/CMakePresets.json
Original file line number Diff line number Diff line change
@@ -1,106 +1,4 @@
{
"version": 2,
"cmakeMinimumRequired": {
"major": 3,
"minor": 20,
"patch": 0
},

"configurePresets": [
{
"name": "ci",
"binaryDir": "${sourceDir}/build",
"generator": "Ninja",
"environment": {
"CUDAARCHS": "72"
},
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release"
}
},
{
"name": "default",
"binaryDir": "${sourceDir}/build",
"generator": "Ninja",
"cacheVariables": {"CMAKE_BUILD_TYPE": "Release",
"mpi": true,
"openmp": true}
},
{
"name": "mac", "inherits": "default",
"displayName": "MacOS",
"description": "MacOS: OpenMP not used",
"cacheVariables": {"openmp": false},
"environment": {
"CC": "gcc-10",
"CXX": "g++-10",
"FC": "gfortran-10"
}
},
{
"name": "makemac", "inherits": ["make", "mac"],
"displayName": "MacOS with Make",
"description": "MacOS: OpenMP not used, using Make"
},
{
"name": "make", "inherits": "default",
"displayName": "build with GNU Make",
"generator": "Unix Makefiles"
},
{
"name": "makewin", "inherits": "default",
"displayName": "build with GNU Make: Windows",
"generator": "MinGW Makefiles"
},
{
"name": "intel", "inherits": "default",
"displayName": "Intel Classic compiler: Linux/MacOS",
"environment": {
"CC": "icc",
"CXX": "icpc",
"FC": "ifort",
"MPI_ROOT": "$env{I_MPI_ROOT}"
}
},
{
"name": "intelwin", "inherits": "intel",
"displayName": "Intel Classic compiler: Windows",
"environment": {
"CC": "icl",
"CXX": "icl"
}
},
{
"name": "intelnext", "inherits": "intel",
"displayName": "Intel oneAPI LLVM",
"environment": {
"CC": "icx",
"CXX": "icx",
"FC": "ifx"
}
}
],
"buildPresets": [
{
"name": "default",
"configurePreset": "default"
},
{
"name": "ci",
"configurePreset": "ci"
}
],
"testPresets": [
{
"name": "default",
"configurePreset": "default",
"output": {
"outputOnFailure": true,
"verbosity": "default"
},
"execution": {
"noTestsAction": "error",
"stopOnFailure": false}
}
]
"version": 4,
"include": ["../CMakePresets.json"]
}

0 comments on commit c9bd8e5

Please sign in to comment.