Skip to content

Commit

Permalink
Merge pull request #4041 from vicentebolea/add-macos-static-build
Browse files Browse the repository at this point in the history
ci: add macos static build
  • Loading branch information
vicentebolea committed Feb 21, 2024
2 parents d44c52d + 33d6eff commit c498921
Show file tree
Hide file tree
Showing 6 changed files with 65 additions and 63 deletions.
24 changes: 13 additions & 11 deletions .github/workflows/everything.yml
Original file line number Diff line number Diff line change
Expand Up @@ -270,9 +270,9 @@ jobs:

runs-on: ${{ matrix.image }}
env:
GH_YML_JOBNAME: ${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.parallel }}
GH_YML_JOBNAME: ${{ matrix.image }}-${{ matrix.compiler }}-${{ matrix.shared }}-${{ matrix.parallel }}
GH_YML_BASE_OS: macOS
GH_YML_MATRIX_OS: ${{ matrix.os }}
GH_YML_MATRIX_OS: ${{ matrix.image }}
GH_YML_MATRIX_COMPILER: ${{ matrix.compiler }}
GH_YML_MATRIX_PARALLEL: ${{ matrix.parallel }}
CCACHE_BASEDIR: "${GITHUB_WORKSPACE}"
Expand All @@ -283,15 +283,17 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macos11, macos12]
parallel: [serial]
image: [macos-11, macos-12]
shared: [static, shared]
include:
- os: macos11
image: macos-11
- parallel: serial
- image: macos-11
compiler: xcode13_0
- os: macos12
image: macos-12
- image: macos-12
compiler: xcode13_4_1
exclude:
- image: macos-11
shared: static

steps:
- uses: actions/checkout@v4
Expand All @@ -308,9 +310,9 @@ jobs:
id: restore-cache
with:
path: .ccache
key: ccache-${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.parallel }}-${{ github.sha }}
key: ccache-${{ matrix.image}}-${{ matrix.compiler }}-${{ matrix.parallel }}-${{ github.sha }}
restore-keys: |
ccache-${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.parallel }}
ccache-${{ matrix.image }}-${{ matrix.compiler }}-${{ matrix.parallel }}
- name: Configure cache
run: ccache -z
- name: Update
Expand All @@ -327,7 +329,7 @@ jobs:
id: save-cache
with:
path: .ccache
key: ccache-${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.parallel }}-${{ github.sha }}
key: ccache-${{ matrix.image }}-${{ matrix.compiler }}-${{ matrix.parallel }}-${{ github.sha }}
- name: Test
run: gha/scripts/ci/gh-actions/run.sh test

Expand Down
52 changes: 52 additions & 0 deletions scripts/ci/cmake/ci-macos-12-xcode13_4_1-static-serial.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# Client maintainer: vicente.bolea@kitware.com
set(ENV{CC} clang)
set(ENV{CXX} clang++)
set(ENV{FC} gfortran-11)

set(dashboard_cache "
BUILD_SHARED_LIBS=OFF
CMAKE_BUILD_TYPE:STRING=Release
BUILD_TESTING:BOOL=ON
ADIOS2_BUILD_EXAMPLES:BOOL=OFF
ADIOS2_USE_AWSSDK:STRING=OFF
ADIOS2_USE_Blosc2:STRING=OFF
ADIOS2_USE_Blosc:BOOL=OFF
ADIOS2_USE_BZip2:BOOL=OFF
ADIOS2_USE_Catalyst:STRING=OFF
ADIOS2_USE_CUDA:STRING=OFF
ADIOS2_USE_DAOS:STRING=OFF
ADIOS2_USE_DataMan:BOOL=OFF
ADIOS2_USE_DataSpaces:STRING=OFF
ADIOS2_USE_Fortran:BOOL=OFF
ADIOS2_USE_HDF5:BOOL=OFF
ADIOS2_USE_HDF5_VOL:STRING=OFF
ADIOS2_USE_IME:STRING=OFF
ADIOS2_USE_Kokkos:STRING=OFF
ADIOS2_USE_LIBPRESSIO:STRING=OFF
ADIOS2_USE_MGARD:STRING=OFF
ADIOS2_USE_MHS:STRING=OFF
ADIOS2_USE_MPI:BOOL=OFF
ADIOS2_USE_PNG:BOOL=OFF
ADIOS2_USE_Python:BOOL=OFF
ADIOS2_USE_SSC:BOOL=OFF
ADIOS2_USE_SST:BOOL=OFF
ADIOS2_USE_SZ:BOOL=OFF
ADIOS2_USE_ZeroMQ:STRING=OFF
ADIOS2_USE_ZFP:BOOL=OFF
CMAKE_C_COMPILER_LAUNCHER=ccache
CMAKE_CXX_COMPILER_LAUNCHER=ccache
CMAKE_C_FLAGS:STRING=-Wall
CMAKE_CXX_FLAGS:STRING=-Wall
CMAKE_Fortran_FLAGS:STRING=-Wall
")

set(ENV{MACOSX_DEPLOYMENT_TARGET} "12.1")
set(CTEST_CMAKE_GENERATOR "Ninja")
list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}")
set(CTEST_TEST_ARGS
# Unclear why these tests currently die. Disabling until it can be addressed.
EXCLUDE "Install.Make.*"
)
include(${CMAKE_CURRENT_LIST_DIR}/ci-common.cmake)
24 changes: 0 additions & 24 deletions scripts/ci/cmake/ci-macos1015-xcode1211-make.cmake

This file was deleted.

28 changes: 0 additions & 28 deletions scripts/ci/cmake/ci-macos11-xcode131-ninja.cmake

This file was deleted.

0 comments on commit c498921

Please sign in to comment.