diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 3cf7141..641b86a 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -5,14 +5,14 @@ name: macOS build on: push: branches: - - main + - '*' paths-ignore: - 'manual/**' tags: - '*' pull_request: branches: - - main + - '*' paths-ignore: - 'manual/**' @@ -28,17 +28,33 @@ jobs: fail-fast: false matrix: include: - - name: macOS latest Homebrew wxOSX - runner: macos-12 + - name: macOS 'latest' Homebrew wxOSX + runner: macos-latest cmake_generator: Xcode cmake_defines: -DCMAKE_CXX_STANDARD=17 use_homebrew: 1 push_cloudsmith: 0 + - name: macOS 15 Homebrew wxOSX + runner: macos-15 + cmake_generator: Ninja + cmake_defines: -DCMAKE_CXX_STANDARD=17 + use_homebrew: 1 + push_cloudsmith: 0 + - name: macOS 13 Homebrew wxOSX + runner: macos-13 + cmake_generator: Ninja + cmake_defines: -DCMAKE_CXX_STANDARD=17 + use_homebrew: 1 + push_cloudsmith: 0 #- name: macOS 11 wxOSX # runner: macos-11 # cmake_generator: Xcode - # cmake_defines: -DCMAKE_CXX_STANDARD=17 -DwxWidgets_CONFIG_EXECUTABLE=/tmp/wx322-2_opencpn50_macos1010/bin/wx-config -DwxWidgets_CONFIG_OPTIONS="--prefix=/tmp/wx322-2_opencpn50_macos1010" + # cmake_defines: -DCMAKE_CXX_STANDARD=11 -DwxWidgets_CONFIG_EXECUTABLE=/tmp/wx322-2_opencpn50_macos1010/bin/wx-config -DwxWidgets_CONFIG_OPTIONS="--prefix=/tmp/wx322-2_opencpn50_macos1010" # push_cloudsmith: 1 + #- name: macOS 10.15 wxOSX + # runner: macos-10.15 + # cmake_generator: Xcode + # cmake_defines: -DCMAKE_CXX_STANDARD=11 -DwxWidgets_CONFIG_EXECUTABLE=/tmp/wx322-2_opencpn50_macos1010/bin/wx-config -DwxWidgets_CONFIG_OPTIONS="--prefix=/tmp/wx322-2_opencpn50_macos1010" env: wxGTK_VERSION: ${{ matrix.gtk_version && matrix.gtk_version || 3 }}