Skip to content

Commit 3e31615

Browse files
committed
fixup! Switch CI from CirlceCI to Github Actions
1 parent 449c3cb commit 3e31615

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

.github/actions/cmake_build/action.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@ name: Build with cmake
22
description: Common steps for library build/test/install using cmake
33
inputs:
44
type:
5-
description: Release, Debug or some other build
5+
description: CMAKE_BUILD_TYPE (Release, Debug, etc)
66
required: false
77
default: Release
88
scan:
99
description: Cmake command prefix
1010
required: false
1111
default: ''
1212
cmakeflags:
13-
description: cmake flags
13+
description: CMAKE_CXX_FLAGS
1414
required: false
1515
default: ''
1616
cxxflags:
17-
description: CXX flags
17+
description: CXX_FLAGS
1818
required: false
1919
default: ''
2020
runs:

.github/workflows/windows.yml

+12-8
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ on:
99
jobs:
1010
windows_build:
1111
runs-on: windows-2019
12+
env:
13+
cmake_generator_x86: '-G "Visual Studio 16 2019" -A Win32'
14+
cmake_generator_x64: '-G "Visual Studio 16 2019" -A x64'
1215
strategy:
1316
matrix:
1417
platform:
@@ -21,10 +24,11 @@ jobs:
2124
- ON
2225
include:
2326
- platform: x86
24-
cmake_generator: '-G "Visual Studio 16 2019" -A Win32'
27+
cmake_generator: $cmake_generator_x86
2528
- platform: x64
26-
cmake_generator: '-G "Visual Studio 16 2019" -A x64'
29+
cmake_generator: $cmake_generator_x64
2730
- platform: x64
31+
cmake_generator: $cmake_generator_x64
2832
config: Release
2933
fmt-header-only: OFF
3034

@@ -52,11 +56,11 @@ jobs:
5256
run: |
5357
mkdir build
5458
cd build
55-
cmake \
56-
-DCMAKE_CXX_FLAGS="-DCRT_SECURE_NO_WARNINGS" \
57-
-DLFP_FMT_HEADER_ONLY=${{ matrix.fmt-header-only }} \
58-
-DCMAKE_BUILD_TYPE=${{ matrix.config }} \
59-
${{ matrix.cmake_generator }} \
60-
..
59+
cmake \
60+
-DCMAKE_CXX_FLAGS="-DCRT_SECURE_NO_WARNINGS" \
61+
-DLFP_FMT_HEADER_ONLY=${{ matrix.fmt-header-only }} \
62+
-DCMAKE_BUILD_TYPE=${{ matrix.config }} \
63+
${{ matrix.cmake_generator }} \
64+
..
6165
cmake --build . --config ${{ matrix.config }} --target install
6266
ctest -C ${{ matrix.config }} --verbose

0 commit comments

Comments
 (0)