Skip to content

Commit

Permalink
ci: Remove MacOSX Deployment Target
Browse files Browse the repository at this point in the history
We only support the 2 latest MacOS releases similar to Ubuntu.
Which CI is already doing.
  • Loading branch information
juan-lunarg committed Oct 19, 2023
1 parent 7b7d15b commit 4366625
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 19 deletions.
20 changes: 5 additions & 15 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 0 additions & 4 deletions BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 4366625

Please sign in to comment.