Skip to content

Commit cf643d6

Browse files
committed
Avoid duplicate definition of --enable-assertions=yes configure flag on Unix builds
- This configuration flag was introduced in commit d47185d in the context of PR owasp-modsecurity#3207. - Moved to the configure step's 'run' command in order to be shared across configurations. - For the sake of reference, matrix.platform.configure should be used for configuration flags that are needed for a specific platform/architecture (which was the reason it was introduced in commit d9255d8, PR owasp-modsecurity#3144).
1 parent 0b5493d commit cf643d6

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
matrix:
1313
os: [ubuntu-22.04]
1414
platform:
15-
- {label: "x64", arch: "amd64", configure: "--enable-assertions=yes"}
16-
- {label: "x32", arch: "i386", configure: "PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig CFLAGS=-m32 CXXFLAGS=-m32 LDFLAGS=-m32 --enable-assertions=yes"}
15+
- {label: "x64", arch: "amd64", configure: ""}
16+
- {label: "x32", arch: "i386", configure: "PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig CFLAGS=-m32 CXXFLAGS=-m32 LDFLAGS=-m32"}
1717
compiler:
1818
- {label: "gcc", cc: "gcc", cxx: "g++"}
1919
- {label: "clang", cc: "clang", cxx: "clang++"}
@@ -66,7 +66,7 @@ jobs:
6666
env:
6767
CC: ${{ matrix.compiler.cc }}
6868
CXX: ${{ matrix.compiler.cxx }}
69-
run: ./configure ${{ matrix.platform.configure }} ${{ matrix.configure.opt }}
69+
run: ./configure ${{ matrix.platform.configure }} ${{ matrix.configure.opt }} --enable-assertions=yes
7070
- uses: ammaraskar/gcc-problem-matcher@master
7171
- name: make
7272
run: make -j `nproc`

0 commit comments

Comments
 (0)