Skip to content

Commit

Permalink
Merge pull request #14 from ZIMO-Elektronik/fix_ci
Browse files Browse the repository at this point in the history
ci: add ppa:ubuntu-toolchain-r/test
  • Loading branch information
higaski committed May 22, 2024
2 parents f957a56 + e730490 commit d618889
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ on:

jobs:
arm-none-eabi-gcc:
uses: ZIMO-Elektronik/.github-workflows/.github/workflows/arm-none-eabi-gcc.yml@v0.0.4
uses: ZIMO-Elektronik/.github-workflows/.github/workflows/arm-none-eabi-gcc.yml@v0.0.6
with:
arch: -mcpu=cortex-m7
target: DCCStm32Decoder DCCStm32CommandStation

esp-elf-gcc:
uses: ZIMO-Elektronik/.github-workflows/.github/workflows/esp-elf-gcc.yml@v0.0.4
uses: ZIMO-Elektronik/.github-workflows/.github/workflows/esp-elf-gcc.yml@v0.0.6
with:
path: examples/esp32
target: esp32

x86_64-linux-gnu-gcc:
uses: ZIMO-Elektronik/.github-workflows/.github/workflows/x86_64-linux-gnu-gcc.yml@v0.0.4
uses: ZIMO-Elektronik/.github-workflows/.github/workflows/x86_64-linux-gnu-gcc.yml@v0.0.6
6 changes: 4 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:

jobs:
tests:
uses: ZIMO-Elektronik/.github-workflows/.github/workflows/ctest.yml@v0.0.4
uses: ZIMO-Elektronik/.github-workflows/.github/workflows/x86_64-linux-gnu-gcc.yml@v0.0.6
with:
target: DCCTests
args: -DCMAKE_BUILD_TYPE=Debug
target: DCCTests
post-build: ctest --test-dir build --schedule-random --timeout 86400
12 changes: 11 additions & 1 deletion tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,17 @@ target_common_warnings(DCCTests PRIVATE)

target_compile_options(DCC INTERFACE -Werror;-Wno-error=deprecated-declarations)

cpmaddpackage("gh:google/googletest#main")
cpmaddpackage(
NAME
googletest
GITHUB_REPOSITORY
"google/googletest"
GIT_TAG
main
SYSTEM
YES
OPTIONS
"INSTALL_GTEST OFF")

target_link_libraries(DCCTests PRIVATE DCC::DCC GTest::gtest_main GTest::gmock)

Expand Down

0 comments on commit d618889

Please sign in to comment.