Skip to content

Commit 5bf5598

Browse files
committed
update github workflows
1 parent 6bb958f commit 5bf5598

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

.github/workflows/linux-build.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: CI-linux-build
22

33

4-
on:
4+
on:
55
push:
66
paths-ignore:
77
- 'docs/**'
@@ -15,7 +15,7 @@ jobs:
1515
linux-gcc-build:
1616

1717
runs-on: ubuntu-latest
18-
18+
1919
strategy:
2020
fail-fast: false
2121
max-parallel: 8
@@ -30,13 +30,13 @@ jobs:
3030
extra-flags: -DJINJA2CPP_STRICT_WARNINGS=OFF
3131
- compiler: gcc-9
3232
extra-flags: -DJINJA2CPP_STRICT_WARNINGS=OFF
33-
33+
3434
exclude:
3535
- compiler: gcc-5
3636
base-flags: -DJINJA2CPP_CXX_STANDARD=17
3737
- compiler: gcc-6
3838
base-flags: -DJINJA2CPP_CXX_STANDARD=17
39-
39+
4040
steps:
4141
- uses: actions/checkout@v1
4242
- name: Setup environment
@@ -55,23 +55,25 @@ jobs:
5555
INPUT_BASE_CONFIG: ${{ matrix.build-config }}
5656
INPUT_EXTRA_FLAGS: ${{ matrix.extra-flags }}
5757
run: |
58+
set -ex
5859
export BUILD_TARGET=all
5960
export CMAKE_OPTS=-DCMAKE_VERBOSE_MAKEFILE=OFF
6061
if [[ "${INPUT_COMPILER}" != "" ]]; then export CXX=${INPUT_COMPILER}; fi
61-
export BUILD_CONFIG=${INPUT_BUILD_CONFIG}
62+
export BUILD_CONFIG=${INPUT_BASE_CONFIG}
6263
$CXX --version
6364
export EXTRA_FLAGS="${INPUT_BASE_FLAGS} ${INPUT_EXTRA_FLAGS}"
6465
6566
- name: Build
6667
env:
6768
INPUT_BUILD_SHARED: ${{ matrix.build-shared }}
6869
run: |
70+
set -ex
6971
mkdir -p .build && cd .build
7072
cmake $CMAKE_OPTS -DCMAKE_BUILD_TYPE=$BUILD_CONFIG -DCMAKE_CXX_FLAGS=$CMAKE_CXX_FLAGS -DJINJA2CPP_DEPS_MODE=internal -DJINJA2CPP_BUILD_SHARED=$INPUT_BUILD_SHARED $EXTRA_FLAGS .. && cmake --build . --config $BUILD_CONFIG --target all -- -j4
7173
7274
- name: Test
7375
run: |
74-
cd .build && ctest -C $BUILD_CONFIG -V
76+
cd .build && ctest -C $BUILD_CONFIG -V
7577
7678
linux-clang-build:
7779

@@ -118,9 +120,10 @@ jobs:
118120
INPUT_BUILD_SHARED: ${{ matrix.build-shared }}
119121
HOME: /home/conan
120122
run: |
123+
set -ex
121124
export BUILD_TARGET=all
122125
export CMAKE_OPTS=-DCMAKE_VERBOSE_MAKEFILE=OFF
123-
export BUILD_CONFIG=${INPUT_BUILD_CONFIG}
126+
export BUILD_CONFIG=${INPUT_BASE_CONFIG}
124127
export WORKSPACE=$GITHUB_WORKSPACE
125128
$CXX --version
126129
export EXTRA_FLAGS="${INPUT_BASE_FLAGS} ${INPUT_EXTRA_FLAGS}"
@@ -131,5 +134,5 @@ jobs:
131134
- name: Test
132135
run: |
133136
cd $BUILD_DIRECTORY
134-
ctest -C $BUILD_CONFIG -V
137+
ctest -C $BUILD_CONFIG -V
135138

.github/workflows/windows-build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: CI-windows-build
22

3-
on:
3+
on:
44
push:
55
paths-ignore:
66
- 'docs/**'
@@ -14,7 +14,7 @@ jobs:
1414
windows-msvc-build:
1515

1616
runs-on: ${{matrix.run-machine}}
17-
17+
1818
strategy:
1919
fail-fast: false
2020
max-parallel: 20
@@ -47,8 +47,8 @@ jobs:
4747
run-machine: windows-2019
4848
generator: Visual Studio 16 2019
4949
vc_vars: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat
50-
51-
50+
51+
5252
steps:
5353
- uses: actions/checkout@v1
5454

0 commit comments

Comments
 (0)