From 4366625ac7f29f37973d7c5e43c4f18c54f61bf8 Mon Sep 17 00:00:00 2001 From: Juan Ramos Date: Thu, 19 Oct 2023 10:41:12 -0600 Subject: [PATCH] ci: Remove MacOSX Deployment Target We only support the 2 latest MacOS releases similar to Ubuntu. Which CI is already doing. --- .github/workflows/build.yml | 20 +++++--------------- BUILD.md | 4 ---- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c28b50188..9bde99064 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -329,7 +329,7 @@ jobs: strategy: matrix: config: [ Debug, Release ] - os: [ macos-11, macos-latest ] + os: [ macos-11, macos-12 ] static_build: [ BUILD_STATIC_LOADER=ON, BUILD_STATIC_LOADER=OFF ] exclude: - os: macos-latest @@ -347,16 +347,11 @@ jobs: - name: Generate build files run: cmake -S. -B build -D CMAKE_BUILD_TYPE=${{matrix.config}} -D ${{matrix.static_build}} -D BUILD_TESTS=ON -D UPDATE_DEPS=ON -D ENABLE_WERROR=ON -D LOADER_ENABLE_ADDRESS_SANITIZER=ON -G "Ninja" env: - # Specify the minimum version of macOS on which the target binaries are to be deployed. - # https://cmake.org/cmake/help/latest/envvar/MACOSX_DEPLOYMENT_TARGET.html - MACOSX_DEPLOYMENT_TARGET: 10.12 LDFLAGS: -Wl,-fatal_warnings - - name: Build the loader - run: cmake --build build + - run: cmake --build build - - name: Install the loader - run: cmake --install build --prefix build/install + - run: cmake --install build --prefix build/install - name: Run regression tests working-directory: ./build @@ -378,13 +373,8 @@ jobs: - name: Generate build files run: cmake -S. -B build -D CMAKE_BUILD_TYPE=Release -D ${{matrix.static_build}} -D BUILD_TESTS=ON -D UPDATE_DEPS=ON -D ENABLE_WERROR=ON -D USE_GAS=OFF -G "Ninja" env: - # Specify the minimum version of macOS on which the target binaries are to be deployed. - # https://cmake.org/cmake/help/latest/envvar/MACOSX_DEPLOYMENT_TARGET.html - MACOSX_DEPLOYMENT_TARGET: 10.12 - - - name: Build the loader - run: cmake --build build - + LDFLAGS: -Wl,-fatal_warnings + - run: cmake --build build - name: Run regression tests working-directory: ./build run: ctest --output-on-failure -E UnknownFunction diff --git a/BUILD.md b/BUILD.md index 1c2f0c920..064b0b679 100644 --- a/BUILD.md +++ b/BUILD.md @@ -534,10 +534,6 @@ regularly as a part of CI. ### MacOS Development Environment Requirements -Tested on OSX version 10.12 - -NOTE: To force the OSX version set the environment variable [MACOSX_DEPLOYMENT_TARGET](https://cmake.org/cmake/help/latest/envvar/MACOSX_DEPLOYMENT_TARGET.html) when building. - Setup Homebrew and components - Ensure Homebrew is at the beginning of your PATH: