GHA/non-native: skip examples in non-unity job

To save time. They are built the same way in the other jobs.

Follow-up to 6fc703904b #16188
Closes #16195
This commit is contained in:
Viktor Szakats 2025-02-05 21:35:58 +01:00
parent a0d3a32fba
commit 136bec79a0
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201

View File

@ -124,7 +124,7 @@ jobs:
matrix: matrix:
include: include:
- { build: 'autotools', arch: 'x86_64', compiler: 'clang' } - { build: 'autotools', arch: 'x86_64', compiler: 'clang' }
- { build: 'cmake' , arch: 'x86_64', compiler: 'clang', options: '-DCMAKE_UNITY_BUILD=OFF -DCURL_TEST_BUNDLES=OFF', tflags: 'skiprun', desc: ' !unity !bundle !testrun' } - { build: 'cmake' , arch: 'x86_64', compiler: 'clang', options: '-DCMAKE_UNITY_BUILD=OFF -DCURL_TEST_BUNDLES=OFF', desc: ' !unity !bundle !runtests !examples' }
- { build: 'autotools', arch: 'arm64', compiler: 'clang' } - { build: 'autotools', arch: 'arm64', compiler: 'clang' }
- { build: 'cmake' , arch: 'arm64', compiler: 'clang' } - { build: 'cmake' , arch: 'arm64', compiler: 'clang' }
fail-fast: false fail-fast: false
@ -156,15 +156,18 @@ jobs:
echo '::group::curl_config.h'; grep -F '#define' lib/curl_config.h | sort || true; echo '::endgroup::' echo '::group::curl_config.h'; grep -F '#define' lib/curl_config.h | sort || true; echo '::endgroup::'
time make -j3 install time make -j3 install
src/curl --disable --version src/curl --disable --version
desc='${{ matrix.desc }}'
if [ '${{ matrix.arch }}' = 'x86_64' ]; then # Slow on emulated CPU if [ '${{ matrix.arch }}' = 'x86_64' ]; then # Slow on emulated CPU
time make -j3 -C tests time make -j3 -C tests
if [ '${{ matrix.tflags }}' != 'skiprun' ]; then if [ "${desc#*!runtests*}" = "${desc}" ]; then
time make test-ci V=1 TFLAGS='-j4' time make test-ci V=1 TFLAGS='-j4'
fi fi
fi fi
if [ "${desc#*!examples*}" = "${desc}" ]; then
echo '::group::build examples' echo '::group::build examples'
time make -j3 examples time make -j3 examples
echo '::endgroup::' echo '::endgroup::'
fi
- name: 'cmake' - name: 'cmake'
if: ${{ matrix.build == 'cmake' }} if: ${{ matrix.build == 'cmake' }}
@ -190,15 +193,18 @@ jobs:
echo '::group::curl_config.h'; grep -F '#define' bld/lib/curl_config.h | sort || true; echo '::endgroup::' echo '::group::curl_config.h'; grep -F '#define' bld/lib/curl_config.h | sort || true; echo '::endgroup::'
time cmake --build bld --config Debug time cmake --build bld --config Debug
bld/src/curl --disable --version bld/src/curl --disable --version
desc='${{ matrix.desc }}'
if [ '${{ matrix.arch }}' = 'x86_64' ]; then # Slow on emulated CPU if [ '${{ matrix.arch }}' = 'x86_64' ]; then # Slow on emulated CPU
time cmake --build bld --config Debug --target testdeps time cmake --build bld --config Debug --target testdeps
if [ '${{ matrix.tflags }}' != 'skiprun' ]; then if [ "${desc#*!runtests*}" = "${desc}" ]; then
time cmake --build bld --config Debug --target test-ci time cmake --build bld --config Debug --target test-ci
fi fi
fi fi
if [ "${desc#*!examples*}" = "${desc}" ]; then
echo '::group::build examples' echo '::group::build examples'
time cmake --build bld --config Debug --target curl-examples time cmake --build bld --config Debug --target curl-examples
echo '::endgroup::' echo '::endgroup::'
fi
omnios: omnios:
name: 'OmniOS, AM gcc openssl amd64' name: 'OmniOS, AM gcc openssl amd64'