Skip to content

Commit

Permalink
Made the CI a bit more uniform.
Browse files Browse the repository at this point in the history
  • Loading branch information
FranckRJ committed Aug 27, 2023
1 parent 4fe7627 commit c079525
Show file tree
Hide file tree
Showing 7 changed files with 69 additions and 48 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci_linux_clang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,4 @@ jobs:
cmake --build build -j
- name: Run tests
run: |
build/tests/FakeIt_tests
ctest --test-dir build/ --verbose
2 changes: 1 addition & 1 deletion .github/workflows/ci_linux_gcc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,4 @@ jobs:
cmake --build build -j
- name: Run tests
run: |
build/tests/FakeIt_tests
ctest --test-dir build/ --verbose
60 changes: 60 additions & 0 deletions .github/workflows/ci_macos_appleclang.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: CI macOS/AppleClang

on:
push:
pull_request:

defaults:
run:
shell: bash

jobs:
build:
name: ${{ matrix.config.name }}
runs-on: ${{ matrix.config.os }}
strategy:
fail-fast: false
matrix:
config:
- {
name: "macOS 11 AppleClang 13",
os: macos-11,
build_type: Debug,
}
- {
name: "macOS 13 AppleClang 14 C++11",
os: macos-13,
build_type: Debug,
cxx_standard: 11
}
- {
name: "macOS 13 AppleClang 14 C++14",
os: macos-13,
build_type: Debug,
cxx_standard: 14
}
- {
name: "macOS 13 AppleClang 14 C++17",
os: macos-13,
build_type: Debug,
cxx_standard: 17
}
- {
name: "macOS 13 AppleClang 14 C++20",
os: macos-13,
build_type: Debug,
cxx_standard: 20
}
steps:
- uses: actions/checkout@v3
- name: Build project
run: |
cmake -S . -B build \
-DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} \
-DENABLE_TESTING=ON \
-DOVERRIDE_CXX_STANDARD_FOR_TESTS=${{ matrix.config.cxx_standard }} \
-DENABLE_SANITIZERS_IN_TESTS=${{ matrix.config.enable_sanitizers_in_tests }}
cmake --build build -j
- name: Run tests
run: |
ctest --test-dir build/ --verbose
2 changes: 1 addition & 1 deletion .github/workflows/ci_windows_msvc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,4 @@ jobs:
cmake --build build --config ${{ matrix.config.build_type }} -j
- name: Run tests
run: |
build/tests/Debug/FakeIt_tests.exe
ctest --test-dir build/ --verbose -C ${{ matrix.config.build_type }}
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
cmake --build build -j
- name: Run tests
run: |
build/tests/FakeIt_tests
ctest --test-dir build/ --verbose
- name: Generate report
run: |
cd build/tests/CMakeFiles/FakeIt_tests.dir
Expand Down
44 changes: 0 additions & 44 deletions .github/workflows/macos.yml

This file was deleted.

5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,8 @@ bii/
*.*~
*.nupkg

# Build
build/

# Testing
Testing/

0 comments on commit c079525

Please sign in to comment.