Skip to content

Commit

Permalink
updates for windows CI
Browse files Browse the repository at this point in the history
* run the RT test on any non Linux system
* try to fix the PATH on msys2
  • Loading branch information
pedrolcl committed Apr 5, 2024
1 parent 876962e commit db6b03c
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
11 changes: 7 additions & 4 deletions .github/workflows/cmake-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ on:
env:
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
BUILD_TYPE: RelWithDebInfo
INSTALL_LOCATION: ${{github.workspace}}/DrumstickV2
PKGNAME: DrumstickV2
INSTALL_LOCATION: ${{env.HOME}}/${{env.PKGNAME}}

jobs:
build:
Expand All @@ -23,15 +24,15 @@ jobs:
fail-fast: false
matrix:
include:
#- { icon: '⬛', sys: mingw32 } #There are no 32 bit packages for Qt6 in msys2
# { icon: '⬛', sys: mingw32 } # There are no 32 bit packages for Qt6 in msys2 anymore
- { icon: '🟦', sys: mingw64 }
- { icon: '🟨', sys: ucrt64 }
- { icon: '🟧', sys: clang64 }
name: 🚧${{ matrix.icon }} ${{ matrix.sys }}
defaults:
run:
shell: msys2 {0}

steps:
- uses: actions/checkout@v4

Expand Down Expand Up @@ -59,7 +60,9 @@ jobs:

- name: '${{ matrix.icon }} Build'
# Build your program with the given configuration
run: cmake --build build --config ${{env.BUILD_TYPE}}
run: |
cmake --build build --config ${{env.BUILD_TYPE}}
echo "$PWD/build/lib/" >> $GITHUB_PATH
- name: '${{ matrix.icon }} Test'
working-directory: build
Expand Down
9 changes: 5 additions & 4 deletions tests/rtTest/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,12 @@ target_link_libraries (rtTest PRIVATE
Qt${QT_VERSION_MAJOR}::Test
Drumstick::RT )


if ((EXISTS "/dev/snd/") AND (EXISTS "/dev/snd/seq"))

if (${CMAKE_SYSTEM} MATCHES "Linux")
if (BUILD_ALSA AND ALSA_FOUND AND (EXISTS "/dev/snd/") AND (EXISTS "/dev/snd/seq"))
add_test (rtTest ${PROJECT_BINARY_DIR}/bin/rtTest)
endif()
else()
add_test (rtTest ${PROJECT_BINARY_DIR}/bin/rtTest)

endif()

if(STATIC_DRUMSTICK)
Expand Down

0 comments on commit db6b03c

Please sign in to comment.