GHA: minimize installed packages in http3-linux and Windows cross-builds
No binary (build failed)
—
(log yok)
| @@ -192,12 +192,8 @@ jobs: | |
| sudo apt-get -o Dpkg::Use-Pty=0 update | |
| sudo rm -f /var/lib/man-db/auto-update | |
| sudo apt-get -o Dpkg::Use-Pty=0 install \ | |
| - | libtool autoconf automake pkgconf stunnel4 \ |
| - | libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev libev-dev libc-ares-dev \ |
| - | nettle-dev libp11-kit-dev libtspi-dev libunistring-dev guile-2.2-dev libtasn1-bin \ |
| - | libtasn1-6-dev libidn2-0-dev gawk gperf libtss2-dev dns-root-data bison gtk-doc-tools \ |
| - | texinfo texlive texlive-extra-utils autopoint libev-dev \ |
| - | apache2 apache2-dev libnghttp2-dev dante-server |
| + | libtool autoconf automake pkgconf \ |
| + | nettle-dev libp11-kit-dev libev-dev autopoint bison gperf gtk-doc-tools libtasn1-bin # for gnutls |
| echo 'CC=gcc-12' >> "$GITHUB_ENV" | |
| echo 'CXX=g++-12' >> "$GITHUB_ENV" | |
| @@ -350,6 +346,7 @@ jobs: | |
| timeout-minutes: 45 | |
| env: | |
| MATRIX_BUILD: ${{ matrix.build.generate && 'cmake' || 'autotools' }} | |
| + | MATRIX_INSTALL_PACKAGES: '${{ matrix.build.install_packages }}' |
| strategy: | |
| fail-fast: false | |
| matrix: | |
| @@ -430,6 +427,7 @@ jobs: | |
| -DUSE_NGTCP2=ON -DCURL_DISABLE_NTLM=ON | |
| - name: 'gnutls' | |
| + | install_packages: nettle-dev libp11-kit-dev |
| install_steps: skipall | |
| PKG_CONFIG_PATH: /home/runner/gnutls/build/lib/pkgconfig:/home/runner/nghttp3/build/lib/pkgconfig:/home/runner/ngtcp2/build/lib/pkgconfig:/home/runner/nghttp2/build/lib/pkgconfig | |
| configure: >- | |
| @@ -438,6 +436,7 @@ jobs: | |
| --with-gnutls=/home/runner/gnutls/build --enable-ssls-export | |
| - name: 'gnutls' | |
| + | install_packages: nettle-dev libp11-kit-dev |
| PKG_CONFIG_PATH: /home/runner/gnutls/build/lib/pkgconfig:/home/runner/nghttp3/build/lib/pkgconfig:/home/runner/ngtcp2/build/lib/pkgconfig:/home/runner/nghttp2/build/lib/pkgconfig | |
| generate: >- | |
| -DCURL_USE_GNUTLS=ON | |
| @@ -493,17 +492,20 @@ jobs: | |
| steps: | |
| - name: 'install prereqs' | |
| + | env: |
| + | INSTALL_PACKAGES: >- |
| + | ${{ !contains(matrix.build.install_steps, 'skipall') && !contains(matrix.build.install_steps, 'skiprun') && 'stunnel4 ' || '' }} |
| + | ${{ !contains(matrix.build.install_steps, 'skipall') && !contains(matrix.build.install_steps, 'skiprun') && 'apache2 apache2-dev libnghttp2-dev vsftpd dante-server' || '' }} |
| + | |
| run: | | |
| sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list | |
| sudo apt-get -o Dpkg::Use-Pty=0 update | |
| sudo rm -f /var/lib/man-db/auto-update | |
| sudo apt-get -o Dpkg::Use-Pty=0 install \ | |
| - | libtool autoconf automake pkgconf stunnel4 \ |
| - | libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev libev-dev libc-ares-dev \ |
| - | nettle-dev libp11-kit-dev libtspi-dev libunistring-dev guile-2.2-dev libtasn1-bin \ |
| - | libtasn1-6-dev libidn2-0-dev gawk gperf libtss2-dev dns-root-data bison gtk-doc-tools \ |
| - | texinfo texlive texlive-extra-utils autopoint libev-dev libuv1-dev \ |
| - | apache2 apache2-dev libnghttp2-dev vsftpd dante-server |
| + | libtool autoconf automake pkgconf \ |
| + | libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev libidn2-0-dev libuv1-dev \ |
| + | ${INSTALL_PACKAGES} \ |
| + | ${MATRIX_INSTALL_PACKAGES} |
| python3 -m venv ~/venv | |
| echo 'CC=gcc-12' >> "$GITHUB_ENV" | |
| echo 'CXX=g++-12' >> "$GITHUB_ENV" | |
| @@ -706,7 +706,7 @@ jobs: | |
| linux-cross-mingw-w64: | |
| name: "linux-mingw, ${{ matrix.build == 'cmake' && 'CM' || 'AM' }} ${{ matrix.compiler }}" | |
| runs-on: ubuntu-latest | |
| - | timeout-minutes: 45 |
| + | timeout-minutes: 15 |
| env: | |
| MAKEFLAGS: -j 5 | |
| TRIPLET: 'x86_64-w64-mingw32' | |
| @@ -725,7 +725,7 @@ jobs: | |
| INSTALL_PACKAGES: ${{ matrix.compiler == 'clang-tidy' && 'clang' || '' }} | |
| run: | | |
| sudo rm -f /var/lib/man-db/auto-update | |
| - | sudo apt-get -o Dpkg::Use-Pty=0 install mingw-w64 ${INSTALL_PACKAGES} |
| + | sudo apt-get -o Dpkg::Use-Pty=0 install gcc-mingw-w64-x86-64-win32 ${INSTALL_PACKAGES} |
| - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5 | |
| with: | |