mirror of
https://github.com/curl/curl.git
synced 2026-07-28 15:33:08 +03:00
GHA: fix and tweak installed packages for http3-linux and Windows-cross
- explicitly install `libldap-dev` to not rely on test-specific packages installing it implicitly, to have the same `curl -V` output for each TLS backend build pair. Follow-up to0455d8772a#18509 - install `libev-dev` for tests. It's a runtime dependency for the local build of `nghttpx`. Missing it made pytest skip 178 tests. Also skewing the 'Gain' time. I estimate it to account for 3 minutes, making the total gain ~20 minutes. Follow-up to0455d8772a#18509 (It may be a better solution to disable libev for the local nghttp2 build, to avoid this hidden dependency.) - fix quiche jobs to use the local build of `libnghttp2`. - stop installing the `clang` package for Windows-cross. `clang` and `clang-tidy` tools are preinstalled on the Ubuntu 24.04 runner. Closes #18519
This commit is contained in:
parent
39c2d4b543
commit
aa8a44ecfa
2 changed files with 5 additions and 6 deletions
7
.github/workflows/http3-linux.yml
vendored
7
.github/workflows/http3-linux.yml
vendored
|
|
@ -476,6 +476,7 @@ jobs:
|
||||||
|
|
||||||
- name: 'quiche'
|
- name: 'quiche'
|
||||||
install_steps: skipall
|
install_steps: skipall
|
||||||
|
PKG_CONFIG_PATH: /home/runner/nghttp2/build/lib/pkgconfig
|
||||||
configure: >-
|
configure: >-
|
||||||
LDFLAGS=-Wl,-rpath,/home/runner/quiche/target/release
|
LDFLAGS=-Wl,-rpath,/home/runner/quiche/target/release
|
||||||
--with-openssl=/home/runner/quiche/quiche/deps/boringssl/src
|
--with-openssl=/home/runner/quiche/quiche/deps/boringssl/src
|
||||||
|
|
@ -484,7 +485,7 @@ jobs:
|
||||||
--enable-unity
|
--enable-unity
|
||||||
|
|
||||||
- name: 'quiche'
|
- name: 'quiche'
|
||||||
PKG_CONFIG_PATH: /home/runner/quiche/target/release
|
PKG_CONFIG_PATH: /home/runner/nghttp2/build/lib/pkgconfig:/home/runner/quiche/target/release
|
||||||
generate: >-
|
generate: >-
|
||||||
-DOPENSSL_ROOT_DIR=/home/runner/quiche/quiche/deps/boringssl/src
|
-DOPENSSL_ROOT_DIR=/home/runner/quiche/quiche/deps/boringssl/src
|
||||||
-DUSE_QUICHE=ON
|
-DUSE_QUICHE=ON
|
||||||
|
|
@ -495,7 +496,7 @@ jobs:
|
||||||
env:
|
env:
|
||||||
INSTALL_PACKAGES: >-
|
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') && 'stunnel4 ' || '' }}
|
||||||
${{ !contains(matrix.build.install_steps, 'skipall') && !contains(matrix.build.install_steps, 'skiprun') && 'apache2 apache2-dev libnghttp2-dev vsftpd dante-server' || '' }}
|
${{ !contains(matrix.build.install_steps, 'skipall') && !contains(matrix.build.install_steps, 'skiprun') && 'apache2 apache2-dev libnghttp2-dev vsftpd dante-server libev-dev' || '' }}
|
||||||
|
|
||||||
run: |
|
run: |
|
||||||
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
|
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
|
||||||
|
|
@ -503,7 +504,7 @@ jobs:
|
||||||
sudo rm -f /var/lib/man-db/auto-update
|
sudo rm -f /var/lib/man-db/auto-update
|
||||||
sudo apt-get -o Dpkg::Use-Pty=0 install \
|
sudo apt-get -o Dpkg::Use-Pty=0 install \
|
||||||
libtool autoconf automake pkgconf \
|
libtool autoconf automake pkgconf \
|
||||||
libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev libidn2-0-dev libuv1-dev \
|
libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev libidn2-0-dev libldap-dev libuv1-dev \
|
||||||
${INSTALL_PACKAGES} \
|
${INSTALL_PACKAGES} \
|
||||||
${MATRIX_INSTALL_PACKAGES}
|
${MATRIX_INSTALL_PACKAGES}
|
||||||
python3 -m venv ~/venv
|
python3 -m venv ~/venv
|
||||||
|
|
|
||||||
4
.github/workflows/windows.yml
vendored
4
.github/workflows/windows.yml
vendored
|
|
@ -721,11 +721,9 @@ jobs:
|
||||||
- { build: 'cmake' , compiler: 'clang-tidy' }
|
- { build: 'cmake' , compiler: 'clang-tidy' }
|
||||||
steps:
|
steps:
|
||||||
- name: 'install packages'
|
- name: 'install packages'
|
||||||
env:
|
|
||||||
INSTALL_PACKAGES: ${{ matrix.compiler == 'clang-tidy' && 'clang' || '' }}
|
|
||||||
run: |
|
run: |
|
||||||
sudo rm -f /var/lib/man-db/auto-update
|
sudo rm -f /var/lib/man-db/auto-update
|
||||||
sudo apt-get -o Dpkg::Use-Pty=0 install gcc-mingw-w64-x86-64-win32 ${INSTALL_PACKAGES}
|
sudo apt-get -o Dpkg::Use-Pty=0 install gcc-mingw-w64-x86-64-win32
|
||||||
|
|
||||||
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
|
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
|
||||||
with:
|
with:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue