From ae5859f30e9379405def652d42d5b4a63e1e8a25 Mon Sep 17 00:00:00 2001 From: Christophe Prud'homme Date: Sat, 8 Jul 2023 12:06:09 +0200 Subject: [PATCH] try fix ci #1 --- .github/workflows/pull_request_test.yml | 11 ++++++++--- .github/workflows/pull_request_test_non_x64.yml | 8 +++++--- CMakeLists.txt | 11 +++++++---- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.github/workflows/pull_request_test.yml b/.github/workflows/pull_request_test.yml index 364a613..95410d0 100644 --- a/.github/workflows/pull_request_test.yml +++ b/.github/workflows/pull_request_test.yml @@ -8,13 +8,14 @@ on: jobs: build_linux: name: Build for linux + if: "!contains(github.event.head_commit.message, '[skip linux]')" runs-on: ${{ matrix.os }} strategy: max-parallel: 4 matrix: arch: [DEIGEN_DONT_VECTORIZE, msse2, mssse3, mavx, mavx2] eigenversion: [3.3.4, 3.3.5, 3.3.6, 3.3.7, 3.3.8, 3.3.9, 3.4.0] - os: [ubuntu-18.04] + os: [ubuntu-22.04] steps: - uses: actions/checkout@v3 - name: Install dependencies @@ -40,13 +41,14 @@ jobs: build_linux_avx512: name: Build for linux AVX512 + if: "!contains(github.event.head_commit.message, '[skip avx]')" runs-on: ${{ matrix.os }} strategy: max-parallel: 4 matrix: arch: [mavx512dq] eigenversion: [3.4.0] - os: [ubuntu-18.04, ubuntu-20.04, ubuntu-22.04] + os: [ubuntu-22.04] steps: - uses: actions/checkout@v3 - name: Install dependencies @@ -71,6 +73,7 @@ jobs: build_macos: name: Build for macOS + if: "!contains(github.event.head_commit.message, '[skip macos]')" runs-on: macOS-10.15 strategy: max-parallel: 4 @@ -100,6 +103,7 @@ jobs: build_windows: name: Build for Windows + if: "!contains(github.event.head_commit.message, '[skip windows]')" runs-on: windows-2019 strategy: max-parallel: 4 @@ -133,6 +137,7 @@ jobs: build_windows_avx512: name: Build for Windows + if: "!contains(github.event.head_commit.message, '[skip windows-avx]')" runs-on: windows-2019 strategy: max-parallel: 4 @@ -169,7 +174,7 @@ jobs: strategy: max-parallel: 4 matrix: - os: [ubuntu-18.04, macOS-10.15, windows-2019] + os: [ubuntu-22.04, macOS-10.15, windows-2019] steps: - uses: actions/checkout@v3 - name: Set up Python3 diff --git a/.github/workflows/pull_request_test_non_x64.yml b/.github/workflows/pull_request_test_non_x64.yml index 34a6ac1..1aaee26 100644 --- a/.github/workflows/pull_request_test_non_x64.yml +++ b/.github/workflows/pull_request_test_non_x64.yml @@ -8,6 +8,7 @@ on: jobs: build_macos_aarch64: name: Build for macOS aarch64 + if: "!contains(github.event.head_commit.message, '[skip macos-aarch64]')" runs-on: macOS-11 strategy: max-parallel: 4 @@ -15,7 +16,7 @@ jobs: arch: [DEIGEN_DONT_VECTORIZE, DDUMMY] eigenversion: [3.3.4, 3.3.5, 3.3.6, 3.3.7, 3.3.8, 3.3.9, 3.4.0] steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - name: Install dependencies run: | wget https://gitlab.com/libeigen/eigen/-/archive/${{ matrix.eigenversion }}/eigen-${{ matrix.eigenversion }}.tar.gz @@ -36,7 +37,8 @@ jobs: build-arm64: name: Build for Arm64-Centos7 - runs-on: ubuntu-18.04 + if: "!contains(github.event.head_commit.message, '[skip arm64]')" + runs-on: ubuntu-22.04 strategy: max-parallel: 4 matrix: @@ -44,7 +46,7 @@ jobs: eigenversion: [3.3.4, 3.3.5, 3.3.6, 3.3.7, 3.3.8, 3.3.9, 3.4.0] steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 with: submodules: true - uses: bab2min/run-on-arch-action@use-custom-image diff --git a/CMakeLists.txt b/CMakeLists.txt index c574d28..9902c0e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,10 +106,10 @@ set(ITEMS foreach(app ${ITEMS}) get_filename_component(app_name ${app} NAME_WE) string(TOLOWER ${app_name} app_name_lower) - string(TOLOWER ${PROJECT_NAME} project_name_lower) - add_executable(${project_name_lower}-${app_name_lower} ${app}) - target_link_libraries(${project_name_lower}-${app_name_lower} PRIVATE eigenrand) - install(TARGETS ${project_name_lower}-${app_name_lower} DESTINATION bin) +# string(TOLOWER ${PROJECT_NAME} project_name_lower) + add_executable(${project_name}-${app_name_lower} ${app}) + target_link_libraries(${project_name}-${app_name_lower} PRIVATE eigenrand) + install(TARGETS ${project_name}-${app_name_lower} DESTINATION bin) endforeach() @@ -119,6 +119,9 @@ FetchContent_Declare(googletest GIT_REPOSITORY https://github.com/google/googlet if(EIGENRAND_BUILD_TEST) FetchContent_MakeAvailable(googletest) + if (NOT TARGET gtest) + message(STATUS FATAL_ERROR "gtest target not found, is there a problem with googltest?") + endif() enable_testing() add_subdirectory( test ) endif()