Skip to content

Commit 57c03e1

Browse files
committed
more fixes for github workflow
1 parent 5bf5598 commit 57c03e1

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

.github/workflows/linux-build.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,25 @@ jobs:
6565
6666
- name: Build
6767
env:
68+
INPUT_BASE_CONFIG: ${{ matrix.build-config }}
69+
INPUT_BASE_FLAGS: ${{ matrix.base-flags }}
6870
INPUT_BUILD_SHARED: ${{ matrix.build-shared }}
71+
INPUT_COMPILER: ${{ matrix.compiler }}
72+
INPUT_EXTRA_FLAGS: ${{ matrix.extra-flags }}
6973
run: |
7074
set -ex
75+
export BUILD_TARGET=all
76+
export CMAKE_OPTS=-DCMAKE_VERBOSE_MAKEFILE=OFF
77+
if [[ "${INPUT_COMPILER}" != "" ]]; then export CXX=${INPUT_COMPILER}; fi
78+
export BUILD_CONFIG=${INPUT_BASE_CONFIG}
79+
$CXX --version
80+
export EXTRA_FLAGS="${INPUT_BASE_FLAGS} ${INPUT_EXTRA_FLAGS}"
7181
mkdir -p .build && cd .build
7282
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
7383
7484
- name: Test
85+
env:
86+
BUILD_CONFIG: ${{ matrix.build-config }}
7587
run: |
7688
cd .build && ctest -C $BUILD_CONFIG -V
7789
@@ -132,6 +144,8 @@ jobs:
132144
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 $WORKSPACE && cmake --build . --config $BUILD_CONFIG --target all -- -j4
133145
134146
- name: Test
147+
env:
148+
BUILD_CONFIG: ${{ matrix.build-config }}
135149
run: |
136150
cd $BUILD_DIRECTORY
137151
ctest -C $BUILD_CONFIG -V

0 commit comments

Comments
 (0)