Skip to content

Commit

Permalink
CI: use preinstalled cmake
Browse files Browse the repository at this point in the history
  • Loading branch information
robUx4 committed Jan 1, 2025
1 parent 1c4e2f3 commit 459f2fb
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 11 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@ jobs:
matrix:
cxx: ['7', '13']
env:
CMAKE_OPTIONS: -DDEV_MODE=ON -DBUILD_TESTING=ON -G Ninja
CMAKE_OPTIONS: -DDEV_MODE=ON -DBUILD_TESTING=ON
steps:
- uses: lukka/get-cmake@latest
- uses: egor-tensin/setup-gcc@v1
with:
version: ${{matrix.cxx}}
Expand All @@ -39,9 +38,8 @@ jobs:
matrix:
cxx: ['7', '19']
env:
CMAKE_OPTIONS: -DDEV_MODE=ON -DBUILD_TESTING=ON -G Ninja -DCMAKE_CXX_FLAGS="-stdlib=libc++"
CMAKE_OPTIONS: -DDEV_MODE=ON -DBUILD_TESTING=ON -DCMAKE_CXX_FLAGS="-stdlib=libc++"
steps:
- uses: lukka/get-cmake@latest
- uses: egor-tensin/setup-clang@v1
with:
version: ${{matrix.cxx}}
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/macos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,8 @@ jobs:
matrix:
arch: [x86_64, arm64]
env:
CMAKE_OPTIONS: -DDEV_MODE=ON -DBUILD_TESTING=ON -G Ninja
CMAKE_OPTIONS: -DDEV_MODE=ON -DBUILD_TESTING=ON
steps:
- uses: lukka/get-cmake@latest

- name: Get pushed code
uses: actions/checkout@v4

Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/uwp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ jobs:
CMAKE_OPTIONS: -DDEV_MODE=ON -DCMAKE_SYSTEM_NAME="WindowsStore" -DCMAKE_SYSTEM_VERSION="10.0" -DCMAKE_CXX_FLAGS_INIT="-DWINVER=0x0A00 -DWINAPI_FAMILY=WINAPI_FAMILY_PC_APP"
# TODO use CreateFile2 and add -DENABLE_WIN32_IO=ON
steps:
- uses: lukka/get-cmake@latest

- name: Get pushed code
uses: actions/checkout@v4

Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ jobs:
env:
CMAKE_OPTIONS: -DDEV_MODE=ON -DCMAKE_CXX_FLAGS_INIT="-DWINVER=0x0501" -DBUILD_TESTING=ON
steps:
- uses: lukka/get-cmake@latest

- name: Get pushed code
uses: actions/checkout@v4

Expand Down

0 comments on commit 459f2fb

Please sign in to comment.