Skip to content

Commit

Permalink
Update workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
albin-johansson committed Oct 14, 2023
1 parent fbe175a commit a262084
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 26 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down Expand Up @@ -59,4 +59,4 @@ jobs:

- name: Run core tests
working-directory: ./build/debug/test
run: ./tactile-core-tests
run: ./tactile-core-test
19 changes: 8 additions & 11 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -30,12 +30,6 @@ jobs:
libxi-dev \
xvfb
- name: Install Boost
id: install-boost
uses: MarkusJx/[email protected]
with:
boost_version: 1.81.0

- name: Cache Vcpkg
id: restore-vcpkg-and-artifacts
uses: actions/cache@v3
Expand Down Expand Up @@ -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
- name: Run core tests
working-directory: ./build/debug/test
run: ./tactile-core-test
22 changes: 9 additions & 13 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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/[email protected]
- uses: lukka/get-cmake@latest

- name: Install Boost
id: install-boost
uses: MarkusJx/[email protected]
with:
boost_version: 1.81.0
toolset: msvc

- name: Cache Vcpkg
id: restore-vcpkg-and-artifacts
uses: actions/cache@v3
Expand Down Expand Up @@ -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
run: tactile-core-test.exe

0 comments on commit a262084

Please sign in to comment.