From 150964617e552c50ddce02ceff9a877c1649f4bf Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 20 Aug 2025 12:44:28 +0200 Subject: [PATCH] move non-unity tests at the end --- .github/workflows/http3-linux.yml | 54 +++++++++++++++---------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/workflows/http3-linux.yml b/.github/workflows/http3-linux.yml index 3a3fd2128d..8f393416e4 100644 --- a/.github/workflows/http3-linux.yml +++ b/.github/workflows/http3-linux.yml @@ -460,33 +460,6 @@ jobs: if: ${{ matrix.build.configure }} run: autoreconf -fi - - name: 'configure non-unity' - env: - MATRIX_CONFIGURE: '${{ matrix.build.configure }}' - MATRIX_GENERATE: '${{ matrix.build.generate }}' - MATRIX_PKG_CONFIG_PATH: '${{ matrix.build.PKG_CONFIG_PATH }}' - run: | - [ -n "${MATRIX_PKG_CONFIG_PATH}" ] && export PKG_CONFIG_PATH="${MATRIX_PKG_CONFIG_PATH}" - if [ "${MATRIX_BUILD}" = 'cmake' ]; then - cmake -B bld -G Ninja \ - -DCMAKE_C_COMPILER_TARGET="$(uname -m)-pc-linux-gnu" -DBUILD_STATIC_LIBS=ON \ - -DCURL_WERROR=ON \ - ${MATRIX_GENERATE} - else - mkdir bld && cd bld && ../configure --enable-warnings --enable-werror \ - --disable-dependency-tracking \ - ${MATRIX_CONFIGURE} - fi - - - name: 'build non-unity' - run: | - if [ "${MATRIX_BUILD}" = 'cmake' ]; then - cmake --build bld --verbose - else - make -C bld V=1 - fi - rm -rf bld - - name: 'configure' env: MATRIX_CONFIGURE: '${{ matrix.build.configure }}' @@ -577,3 +550,30 @@ jobs: else make -C bld V=1 examples fi + + - name: 'configure non-unity' + env: + MATRIX_CONFIGURE: '${{ matrix.build.configure }}' + MATRIX_GENERATE: '${{ matrix.build.generate }}' + MATRIX_PKG_CONFIG_PATH: '${{ matrix.build.PKG_CONFIG_PATH }}' + run: | + rm -rf bld + [ -n "${MATRIX_PKG_CONFIG_PATH}" ] && export PKG_CONFIG_PATH="${MATRIX_PKG_CONFIG_PATH}" + if [ "${MATRIX_BUILD}" = 'cmake' ]; then + cmake -B bld -G Ninja \ + -DCMAKE_C_COMPILER_TARGET="$(uname -m)-pc-linux-gnu" -DBUILD_STATIC_LIBS=ON \ + -DCURL_WERROR=ON \ + ${MATRIX_GENERATE} + else + mkdir bld && cd bld && ../configure --enable-warnings --enable-werror \ + --disable-dependency-tracking \ + ${MATRIX_CONFIGURE} + fi + + - name: 'build non-unity' + run: | + if [ "${MATRIX_BUILD}" = 'cmake' ]; then + cmake --build bld --verbose + else + make -C bld V=1 + fi