ci: parallelize more, tidy up cmake commands (distcheck, macos)

Also enable `-DCURL_WERROR=ON` in the Linux cmake build test.

Closes #13343
This commit is contained in:
Viktor Szakats 2024-04-08 13:18:35 +00:00
parent 0f7be5a519
commit bba4c313bc
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
2 changed files with 9 additions and 11 deletions

View File

@ -60,9 +60,9 @@ jobs:
tar xvf curl-99.98.97.tar.gz tar xvf curl-99.98.97.tar.gz
pushd curl-99.98.97 pushd curl-99.98.97
./configure --prefix=$HOME/temp --without-ssl --without-libpsl ./configure --prefix=$HOME/temp --without-ssl --without-libpsl
make make -j3
make test-ci make -j3 test-ci
make install make -j3 install
popd popd
# basic check of the installed files # basic check of the installed files
bash scripts/installcheck.sh $HOME/temp bash scripts/installcheck.sh $HOME/temp
@ -85,8 +85,8 @@ jobs:
mkdir build mkdir build
pushd build pushd build
../curl-99.98.97/configure --without-ssl --without-libpsl ../curl-99.98.97/configure --without-ssl --without-libpsl
make make -j3
make test-ci make -j3 test-ci
popd popd
rm -rf build rm -rf build
rm -rf curl-99.98.97 rm -rf curl-99.98.97
@ -126,8 +126,6 @@ jobs:
echo "::stop-commands::$(uuidgen)" echo "::stop-commands::$(uuidgen)"
tar xvf curl-99.98.97.tar.gz tar xvf curl-99.98.97.tar.gz
pushd curl-99.98.97 pushd curl-99.98.97
mkdir build cmake -B build -DCURL_WERROR=ON
pushd build make -C build -j3
cmake ..
make
name: 'verify out-of-tree cmake build' name: 'verify out-of-tree cmake build'

View File

@ -239,8 +239,8 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- run: cmake -S. -Bbuild -DCMAKE_UNITY_BUILD=ON -DCURL_WERROR=ON ${{ matrix.build.generate }} - run: cmake -B build -DCMAKE_UNITY_BUILD=ON -DCURL_WERROR=ON ${{ matrix.build.generate }}
name: 'cmake generate' name: 'cmake generate'
- run: cmake --build build - run: cmake --build build --parallel 3
name: 'cmake build' name: 'cmake build'