diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index ae6d2735e3..c8a415abd3 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -13,7 +13,7 @@ jobs: runs-on: macos-latest if: contains(github.event.head_commit.message, '[skip-ci]') == false steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install system dependencies run: | @@ -59,4 +59,4 @@ jobs: - name: Run core tests working-directory: ./build/debug/test - run: ./tactile-core-tests + run: ./tactile-core-test diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 8ce04c60e7..cafa6e4d6d 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest if: contains(github.event.head_commit.message, '[skip-ci]') == false steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: lukka/get-cmake@latest - name: Install system dependencies run: | @@ -30,12 +30,6 @@ jobs: libxi-dev \ xvfb - - name: Install Boost - id: install-boost - uses: MarkusJx/install-boost@v2.4.3 - with: - boost_version: 1.81.0 - - name: Cache Vcpkg id: restore-vcpkg-and-artifacts uses: actions/cache@v3 @@ -74,11 +68,14 @@ jobs: run: | mkdir build && cd build cmake .. -GNinja \ - -DCMAKE_BUILD_TYPE=Debug + -DCMAKE_BUILD_TYPE=Debug \ + -DTACTILE_USE_SANITIZERS=OFF \ + -DTACTILE_BUILD_TESTS=ON \ + --log-level=DEBUG - name: Build run: ninja -C build - - name: Run tests - working-directory: ./build/test - run: ./TactileTests \ No newline at end of file + - name: Run core tests + working-directory: ./build/debug/test + run: ./tactile-core-test \ No newline at end of file diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 42c0de6907..33907996f2 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -4,7 +4,7 @@ on: [ push ] env: VCPKG_ROOT: ${{github.workspace}}\vcpkg - VCPKG_TARGET_TRIPLET: x64-windows-static-md + VCPKG_TARGET_TRIPLET: x64-windows VCPKG_DEFAULT_BINARY_CACHE: ${{github.workspace}}\vcpkg\bincache VCPKG_CACHE_EDITION: 1 @@ -13,17 +13,10 @@ jobs: runs-on: windows-latest if: contains(github.event.head_commit.message, '[skip-ci]') == false steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: ilammy/msvc-dev-cmd@v1.11.0 - uses: lukka/get-cmake@latest - - name: Install Boost - id: install-boost - uses: MarkusJx/install-boost@v2.4.3 - with: - boost_version: 1.81.0 - toolset: msvc - - name: Cache Vcpkg id: restore-vcpkg-and-artifacts uses: actions/cache@v3 @@ -55,12 +48,15 @@ jobs: cd build cmake .. -GNinja ` -DCMAKE_BUILD_TYPE=Debug ` - -DVCPKG_TARGET_TRIPLET=${{env.VCPKG_TARGET_TRIPLET}} + -DVCPKG_TARGET_TRIPLET=${{env.VCPKG_TARGET_TRIPLET}} ` + -DTACTILE_USE_SANITIZERS=OFF ` + -DTACTILE_BUILD_TESTS=ON ` + --log-level=DEBUG - name: Build run: ninja -C build - - name: Run tests - working-directory: ./build/test + - name: Run core tests + working-directory: ./build/debug/test shell: cmd - run: TactileTests.exe \ No newline at end of file + run: tactile-core-test.exe \ No newline at end of file