CI: enable parallel make in more builds

Most CI services provide at least two cores, so enable parallel make
jobs to take advantage of that for builds. Some dependencies aren't safe
to build in parallel so leave those as-is.  Also, rename a few
workflows to eliminate duplicate names and provide a better idea what
they're about.
This commit is contained in:
Dan Fandrich 2023-06-23 12:51:41 -07:00
parent cfab581041
commit fb802b521a
10 changed files with 43 additions and 21 deletions

View File

@ -122,12 +122,12 @@ commands:
build:
steps:
- run: make V=1
- run: make V=1 examples
- run: make -j3 V=1
- run: make -j3 V=1 examples
test:
steps:
- run: make V=1 test-ci
- run: make -j3 V=1 test-ci
executors:
ubuntu:

View File

@ -53,7 +53,7 @@ freebsd_task:
env:
CIRRUS_CLONE_DEPTH: 10
CRYPTOGRAPHY_DONT_BUILD_RUST: 1
MAKE_FLAGS: -j 2
MAKE_FLAGS: -j 3
pkginstall_script:
- pkg update -f
@ -145,7 +145,7 @@ windows_task:
env:
CIRRUS_CLONE_DEPTH: 10
MSYS2_PATH_TYPE: inherit
MAKEFLAGS: -j 2
MAKEFLAGS: -j 3
prepare_script: |
%container_cmd% -l -c "cd $(echo '%cd%') && %prepare%"
@ -241,7 +241,7 @@ macos_task:
env:
CIRRUS_CLONE_DEPTH: 10
MAKE_FLAGS: -j 4
MAKE_FLAGS: -j 12
pkginstall_script:
- echo libtool autoconf automake pkg-config ${install_packages} | xargs -Ix -n1 echo brew '"x"' > /tmp/Brewfile
@ -278,7 +278,7 @@ linux_musl_task:
env:
CIRRUS_CLONE_DEPTH: 10
MAKEFLAGS: -j 2
MAKEFLAGS: -j 3
pkginstall_script:
- apk add --no-cache build-base autoconf automake libtool perl openssl-dev libssh2-dev zlib-dev brotli-dev zstd-dev libidn2-dev openldap-dev heimdal-dev libpsl-dev py3-impacket py3-asn1 py3-six py3-pycryptodomex perl-time-hires openssh stunnel sudo

View File

@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: curl
name: Linux
name: Linux AWS-LC
on:
push:
@ -40,6 +40,9 @@ concurrency:
permissions: {}
env:
MAKEFLAGS: -j 3
jobs:
autoconf:
name: awslc (autoconf)
@ -77,13 +80,13 @@ jobs:
cd ..
name: 'configure out-of-tree'
- run: make -C build -j 2 V=1
- run: make -C build V=1
name: 'make'
- run: make -C build -j 2 V=1 examples
- run: make -C build V=1 examples
name: 'make examples'
- run: make -C build -j 2 V=1 -C tests
- run: make -C build V=1 -C tests
name: 'make tests'
- run: make -C build V=1 test-ci

View File

@ -39,6 +39,9 @@ concurrency:
permissions: {}
env:
MAKEFLAGS: -j 3
jobs:
autotools:
name: ${{ matrix.build.name }}
@ -231,7 +234,7 @@ jobs:
git clone --quiet --depth=1 https://github.com/openssl/openssl
cd openssl
./config enable-tls1_3 --prefix=$HOME/openssl3
make install_sw
make -j1 install_sw
name: 'install openssl'
- if: ${{ contains(matrix.build.install_steps, 'quictls') }}
@ -239,7 +242,7 @@ jobs:
git clone --quiet --depth=1 -b OpenSSL_1_1_1t+quic https://github.com/quictls/openssl
cd openssl
./config enable-tls1_3 --prefix=$HOME/quictls
make install_sw
make -j1 install_sw
name: 'install quictls'
- if: ${{ contains(matrix.build.install_steps, 'msh3') }}

View File

@ -41,6 +41,7 @@ permissions: {}
env:
DEVELOPER_DIR: /Applications/Xcode_14.0.1.app/Contents/Developer
MAKEFLAGS: -j 5
jobs:
autotools:

View File

@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: curl
name: ngtcp2
name: ngtcp2 GnuTLS
on:
push:
@ -44,6 +44,9 @@ concurrency:
permissions: {}
env:
MAKEFLAGS: -j 3
jobs:
autotools:
name: ${{ matrix.build.name }}
@ -81,7 +84,7 @@ jobs:
git clone --quiet --depth=1 -b openssl-3.0.9+quic https://github.com/quictls/openssl
cd openssl
./config --prefix=$HOME/all --libdir=$HOME/all/lib
make install_sw
make -j1 install_sw
name: 'install quictls'
- run: |

View File

@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: curl
name: ngtcp2
name: ngtcp2 quictls
on:
push:
@ -44,6 +44,9 @@ concurrency:
permissions: {}
env:
MAKEFLAGS: -j 3
jobs:
autotools:
name: ${{ matrix.build.name }}
@ -74,7 +77,7 @@ jobs:
git clone --quiet --depth=1 -b openssl-3.0.9+quic https://github.com/quictls/openssl
cd openssl
./config --prefix=$HOME/all --libdir=$HOME/all/lib
make install_sw
make -j1 install_sw
name: 'install quictls'
- run: |

View File

@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: curl
name: ngtcp2
name: ngtcp2 wolfSSL
on:
push:
@ -44,6 +44,9 @@ concurrency:
permissions: {}
env:
MAKEFLAGS: -j 3
jobs:
autotools:
name: ${{ matrix.build.name }}
@ -84,7 +87,7 @@ jobs:
git clone --quiet --depth=1 -b openssl-3.0.9+quic https://github.com/quictls/openssl
cd openssl
./config --prefix=$HOME/all --libdir=$HOME/all/lib
make install_sw
make -j1 install_sw
name: 'install quictls'
- run: |

View File

@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: curl
name: Linux
name: Linux torture
on:
push:
@ -44,6 +44,9 @@ concurrency:
permissions: {}
env:
MAKEFLAGS: -j 3
jobs:
autotools:
name: ${{ matrix.build.name }}

View File

@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: curl
name: Linux
name: Linux wolfSSL
on:
push:
@ -44,6 +44,9 @@ concurrency:
permissions: {}
env:
MAKEFLAGS: -j 3
jobs:
autotools:
name: ${{ matrix.build.name }}