CI: move autogen.sh to specific build scripts.

It seems that autogen.sh is not called in some situations
(merge request updating configure scripts).

Let's move this directly before configure.
Also print disable-<feature> options to CI output.
This commit is contained in:
Milan Broz
2023-03-06 09:53:52 +01:00
committed by Daniel Zaťovič
parent 27f8e5c08f
commit 8b3162069e
4 changed files with 9 additions and 1 deletions

View File

@@ -3,6 +3,7 @@ test-clang-compilation:
- .gitlab-shared-clang - .gitlab-shared-clang
script: script:
- export CFLAGS="-Wall -Werror" - export CFLAGS="-Wall -Werror"
- ./autogen.sh
- ./configure - ./configure
- make -j - make -j
- make -j check-programs - make -j check-programs
@@ -13,6 +14,7 @@ test-clang-Wall-script:
script: script:
- export CFLAGS="-g -O0" - export CFLAGS="-g -O0"
- export CC="$CI_PROJECT_DIR/.gitlab/ci/clang-Wall" - export CC="$CI_PROJECT_DIR/.gitlab/ci/clang-Wall"
- ./autogen.sh
- ./configure - ./configure
- make -j CFLAGS="-g -O0 -Werror" - make -j CFLAGS="-g -O0 -Werror"
- make -j CFLAGS="-g -O0 -Werror" check-programs - make -j CFLAGS="-g -O0 -Werror" check-programs
@@ -21,6 +23,7 @@ test-scan-build:
extends: extends:
- .gitlab-shared-clang - .gitlab-shared-clang
script: script:
- ./autogen.sh
- scan-build${COMPILER_VERSION:+-$COMPILER_VERSION} -V ./configure CFLAGS="-g -O0" - scan-build${COMPILER_VERSION:+-$COMPILER_VERSION} -V ./configure CFLAGS="-g -O0"
- make clean - make clean
- scan-build${COMPILER_VERSION:+-$COMPILER_VERSION} --status-bugs -maxloop 10 make -j - scan-build${COMPILER_VERSION:+-$COMPILER_VERSION} --status-bugs -maxloop 10 make -j

View File

@@ -3,6 +3,7 @@ test-gcc-compilation:
- .gitlab-shared-gcc - .gitlab-shared-gcc
script: script:
- export CFLAGS="-Wall -Werror" - export CFLAGS="-Wall -Werror"
- ./autogen.sh
- ./configure - ./configure
- make -j - make -j
- make -j check-programs - make -j check-programs
@@ -13,6 +14,7 @@ test-gcc-Wall-script:
script: script:
- export CFLAGS="-g -O0" - export CFLAGS="-g -O0"
- export CC="$CI_PROJECT_DIR/.gitlab/ci/gcc-Wall" - export CC="$CI_PROJECT_DIR/.gitlab/ci/gcc-Wall"
- ./autogen.sh
- ./configure - ./configure
- make -j CFLAGS="-g -O0 -Werror" - make -j CFLAGS="-g -O0 -Werror"
- make -j CFLAGS="-g -O0 -Werror" check-programs - make -j CFLAGS="-g -O0 -Werror" check-programs
@@ -22,6 +24,7 @@ test-gcc-fanalyzer:
- .gitlab-shared-gcc - .gitlab-shared-gcc
script: script:
- export CFLAGS="-Wall -Werror -g -O0 -fanalyzer -fdiagnostics-path-format=separate-events" - export CFLAGS="-Wall -Werror -g -O0 -fanalyzer -fdiagnostics-path-format=separate-events"
- ./autogen.sh
- ./configure - ./configure
- make -j - make -j
- make -j check-programs - make -j check-programs

View File

@@ -20,10 +20,13 @@ test-gcc-disable-compiles:
script: script:
- DEBIAN_FRONTEND=noninteractive apt-get -yq install meson ninja-build - DEBIAN_FRONTEND=noninteractive apt-get -yq install meson ninja-build
- export CFLAGS="-Wall -Werror" - export CFLAGS="-Wall -Werror"
- ./autogen.sh
- echo "Configuring with --disable-$DISABLE_FLAGS"
- ./configure $(for i in $DISABLE_FLAGS; do echo "--disable-$i"; done) - ./configure $(for i in $DISABLE_FLAGS; do echo "--disable-$i"; done)
- make -j - make -j
- make -j check-programs - make -j check-programs
- git checkout -f && git clean -xdf - git checkout -f && git clean -xdf
- meson -v - meson -v
- echo "Configuring with -D$DISABLE_FLAGS=false"
- meson setup meson_builddir $(for i in $DISABLE_FLAGS; do echo "-D$i=false"; done) - meson setup meson_builddir $(for i in $DISABLE_FLAGS; do echo "-D$i=false"; done)
- ninja -C meson_builddir - ninja -C meson_builddir

View File

@@ -12,7 +12,6 @@
- .gitlab/ci/cibuild-setup-ubuntu.sh - .gitlab/ci/cibuild-setup-ubuntu.sh
- export CC="${COMPILER}${COMPILER_VERSION:+-$COMPILER_VERSION}" - export CC="${COMPILER}${COMPILER_VERSION:+-$COMPILER_VERSION}"
- export CXX="${COMPILER}++${COMPILER_VERSION:+-$COMPILER_VERSION}" - export CXX="${COMPILER}++${COMPILER_VERSION:+-$COMPILER_VERSION}"
- ./autogen.sh
.gitlab-shared-gcc: .gitlab-shared-gcc:
extends: extends: