Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CI] Fix MacOS builds in Github Actions #158

Merged
merged 7 commits into from
Dec 29, 2024
Merged

[CI] Fix MacOS builds in Github Actions #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
43473ed
Temporary disable other builds
uilianries Dec 29, 2024
69fe386
Update xcode and macos to newer versions
uilianries Dec 29, 2024
25e5a41
Fix ctest usage
uilianries Dec 29, 2024
74ca58b
Fix cmake build command
uilianries Dec 29, 2024
df555d3
Use Ninja with CMake
uilianries Dec 29, 2024
5605fb5
Requires CMake 3.10 to avoid future lack of Compatibility
uilianries Dec 29, 2024
c4e9719
Revert "Temporary disable other builds"
uilianries Dec 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 13 additions & 25 deletions .github/workflows/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,34 +16,22 @@ jobs:
fail-fast: false
matrix:
include:
- xcode: 11
build_type: Debug
os: macos-11
- xcode: 11
- xcode: 14
build_type: Release
os: macos-11
- xcode: 12
build_type: Debug
os: macos-11
- xcode: 12
os: macos-13
- xcode: 15
build_type: Release
os: macos-11
- xcode: 13
build_type: Debug
os: macos-12
- xcode: 13
os: macos-14
- xcode: 16
build_type: Release
os: macos-12
- xcode: 14
build_type: Debug
os: macos-12
- xcode: 14
build_type: Release
os: macos-12
os: macos-15
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v3
- name: Install Ninja
run: brew install ninja

- uses: actions/checkout@v4
with:
submodules: recursive

Expand All @@ -54,10 +42,10 @@ jobs:
- run: cmake -E make_directory build

- working-directory: build/
run: cmake $GITHUB_WORKSPACE
run: cmake $GITHUB_WORKSPACE -GNinja -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}

- working-directory: build/
run: cmake --build . --config ${{ matrix.build_type }}
run: cmake --build .

- working-directory: build/
run: ctest --config ${{ matrix.build_type }} --output-on-failure
run: ctest --output-on-failure
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.8)
cmake_minimum_required(VERSION 3.10)

project(taocpp-json VERSION 1.0.0 LANGUAGES CXX)

Expand Down
2 changes: 1 addition & 1 deletion external/PEGTL
Open in desktop
Submodule PEGTL updated 12 files
+12 −17 .github/workflows/android.yml
+64 −48 .github/workflows/linux.yml
+36 −29 .github/workflows/macos.yml
+0 −56 .github/workflows/msys.yml
+64 −27 .github/workflows/windows.yml
+0 −7 .pkg-config/pegtl.pc.in
+2 −7 CMakeLists.txt
+1 −1 doc/Actions-and-States.md
+7 −2 include/tao/pegtl/internal/read_file_stdio.hpp
+1 −1 include/tao/pegtl/normal.hpp
+0 −7 src/test/pegtl/CMakeLists.txt
+1 −1 src/test/pegtl/verify_file.hpp
Loading