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

Treat GitHub Actions CI like travis/appveyor CI #297

Merged
merged 1 commit into from
Aug 31, 2021
Merged

Treat GitHub Actions CI like travis/appveyor CI #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 1 addition & 4 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,10 @@ jobs:

build-windows:
runs-on: ${{ matrix.os }}
env:
subset: ${{ matrix.subset }}
name: build-${{ matrix.os }}-${{ matrix.subset }}
name: build-${{ matrix.os }}
strategy:
fail-fast: false
matrix:
subset: [sse, avx]
os: [windows-2016] # , windows-2019
steps:
- uses: actions/checkout@v2
Expand Down
5 changes: 4 additions & 1 deletion test.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,13 @@ endif()
# determine the (short) hostname of the build machine
################################################################################
set(travis_os $ENV{TRAVIS_OS_NAME})
set(github_ci $ENV{GITHUB_ACTIONS})
if(travis_os)
set(CTEST_SITE "Travis CI")
elseif(appveyor)
set(CTEST_SITE "AppVeyor CI")
elseif(github_ci)
set(CTEST_SITE "GitHub Actions")
else()
execute_process(COMMAND hostname -s RESULT_VARIABLE ok OUTPUT_VARIABLE CTEST_SITE ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
if(NOT ok EQUAL 0)
Expand Down Expand Up @@ -434,7 +437,7 @@ macro(go)
unset(CTEST_NOTES_FILES) # less clutter in ctest -V output
if(res EQUAL 0)
set(test_results 0)
if(travis_os)
if(travis_os OR github_ci)
set(CTEST_BUILD_COMMAND "${CMAKE_MAKE_PROGRAM} ${MAKE_ARGS}")
ctest_build(
BUILD "${CTEST_BINARY_DIRECTORY}"
Expand Down