mirror of
https://github.com/curl/curl.git
synced 2026-05-01 03:17:50 +03:00
GHA/configure-vs-cmake: add macOS build, fix issues
- sync cmake macOS `OS` value manually with the autotools one. - stop exporting/subst-ing `HAVE_OPENSSL_QUIC` from autotools. The variable was only used internally. - exclude a dependency detection symbol. - allow to run when the workflow itself was updated. - simplify cmake command. - fix indentation. Closes #14546
This commit is contained in:
parent
2784801977
commit
304a349e8c
4 changed files with 32 additions and 7 deletions
1
.github/scripts/cmp-config.pl
vendored
1
.github/scripts/cmp-config.pl
vendored
|
|
@ -51,6 +51,7 @@ my %remove = (
|
|||
'#define HAVE_LIBSSH2 1' => 1,
|
||||
'#define HAVE_LIBSSL 1' => 1,
|
||||
'#define HAVE_LIBZSTD 1' => 1,
|
||||
'#define HAVE_NGHTTP2_NGHTTP2_H 1' => 1,
|
||||
'#define HAVE_OPENSSL3 1' => 1,
|
||||
'#define HAVE_OPENSSL_CRYPTO_H 1' => 1,
|
||||
'#define HAVE_OPENSSL_ERR_H 1' => 1,
|
||||
|
|
|
|||
33
.github/workflows/configure-vs-cmake.yml
vendored
33
.github/workflows/configure-vs-cmake.yml
vendored
|
|
@ -13,6 +13,7 @@ on:
|
|||
- '**/CMakeLists.txt'
|
||||
- 'lib/curl_config.h.cmake'
|
||||
- '.github/scripts/cmp-config.pl'
|
||||
- '.github/workflows/configure-vs-cmake.yml'
|
||||
|
||||
pull_request:
|
||||
branches:
|
||||
|
|
@ -23,23 +24,47 @@ on:
|
|||
- '**/CMakeLists.txt'
|
||||
- 'lib/curl_config.h.cmake'
|
||||
- '.github/scripts/cmp-config.pl'
|
||||
- '.github/workflows/configure-vs-cmake.yml'
|
||||
|
||||
permissions: {}
|
||||
|
||||
jobs:
|
||||
check:
|
||||
check-linux:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
|
||||
|
||||
- name: run configure --with-openssl
|
||||
run: |
|
||||
autoreconf -fi
|
||||
./configure --with-openssl --without-libpsl
|
||||
autoreconf -fi
|
||||
./configure --with-openssl --without-libpsl
|
||||
|
||||
- name: run cmake
|
||||
run: |
|
||||
mkdir build && cd build && cmake ..
|
||||
cmake -B build
|
||||
|
||||
- name: compare generated curl_config.h files
|
||||
run: ./.github/scripts/cmp-config.pl lib/curl_config.h build/lib/curl_config.h
|
||||
|
||||
check-macos:
|
||||
runs-on: macos-latest
|
||||
steps:
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
|
||||
|
||||
- name: install packages
|
||||
run: |
|
||||
while [[ $? == 0 ]]; do for i in 1 2 3; do brew update && brew install libtool autoconf automake && break 2 || { echo Error: wait to try again; sleep 10; } done; false Too many retries; done
|
||||
|
||||
- name: run configure --with-openssl
|
||||
run: |
|
||||
autoreconf -fi
|
||||
./configure --with-openssl --without-libpsl
|
||||
|
||||
- name: run cmake
|
||||
run: |
|
||||
cmake -B build \
|
||||
"-DCMAKE_C_COMPILER_TARGET=$(uname -m | sed 's/arm64/aarch64/')-apple-darwin$(uname -r)" \
|
||||
-DCURL_USE_LIBSSH2=OFF
|
||||
|
||||
- name: compare generated curl_config.h files
|
||||
run: ./.github/scripts/cmp-config.pl lib/curl_config.h build/lib/curl_config.h
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue