Skip to content

Commit

Permalink
Revert "Add macOS back to GH actions build"
Browse files Browse the repository at this point in the history
This reverts commit ae75f41
  • Loading branch information
janhenke committed Dec 22, 2024
1 parent 0a2c8bb commit c68d519
Showing 1 changed file with 32 additions and 24 deletions.
56 changes: 32 additions & 24 deletions .github/workflows/cmake-multi-platform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,33 +18,28 @@ jobs:
fail-fast: false

matrix:
os: [macos-latest, ubuntu-latest, windows-latest]
build_type: [ Debug, Release]
os: [ ubuntu-24.04, windows-latest ]
toolchain: [ GNU, LLVM, MSVC ]
build_type: [ Debug, Release ]
c_compiler: [cl, clang, gcc]
include:
- os: ubuntu-24.04
toolchain: GNU
c_compiler: gcc-14
cpp_compiler: g++-14
- os: windows-latest
c_compiler: cl
cpp_compiler: cl
- os: ubuntu-latest
c_compiler: gcc
cpp_compiler: g++
- os: ubuntu-latest
c_compiler: clang
cpp_compiler: clang++
- os: macos-latest
c_compiler: clang
cpp_compiler: clang++
exclude:
toolchain: LLVM
msvc_toolchain: ClangCL
- os: windows-latest
c_compiler: gcc
toolchain: MSVC
msvc_toolchain: v143
exclude:
- os: ubuntu-24.04
toolchain: LLVM
- os: ubuntu-24.04
toolchain: MSVC
- os: windows-latest
c_compiler: clang
- os: ubuntu-latest
c_compiler: cl
- os: macos-latest
c_compiler: gcc
- os: macos-latest
c_compiler: cl
toolchain: GNU

steps:
- uses: actions/github-script@v6
Expand All @@ -53,7 +48,7 @@ jobs:
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
- uses: actions/checkout@v4
- uses: actions/checkout@v3

- name: Set reusable strings
# Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.
Expand All @@ -66,7 +61,8 @@ jobs:
if: runner.os == 'Windows'
run: choco install pkgconfiglite

- name: Configure CMake
- name: Configure CMake (Linux)
if: runner.os == 'Linux'
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
run: >
Expand All @@ -77,6 +73,18 @@ jobs:
-DCMAKE_TOOLCHAIN_FILE="$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake"
-S ${{ github.workspace }}
- name: Configure CMake (Windows)
if: runner.os == 'Windows'
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
run: >
cmake -B ${{ steps.strings.outputs.build-output-dir }}
-G "Visual Studio 17 2022"
-T ${{ matrix.msvc_toolchain }}
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
-DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake"
-S ${{ github.workspace }}
- name: Build
# Build your program with the given configuration. Note that --config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }}
Expand Down

0 comments on commit c68d519

Please sign in to comment.