ci: move the OpenSSL + c-ares job from Zuul to Circle CI

Closes #8357
This commit is contained in:
Daniel Stenberg 2022-01-31 09:41:31 +01:00
parent 9a8888c94b
commit 609ea92718
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 28 additions and 14 deletions

View File

@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___ # | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____| # \___|\___/|_| \_\_____|
# #
# Copyright (C) 2021, Daniel Stenberg, <daniel@haxx.se>, et al. # Copyright (C) 2021, 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
# #
# This software is licensed as described in the file COPYING, which # This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms # you should have received as part of this distribution. The terms
@ -33,6 +33,19 @@ commands:
./buildconf ./buildconf
./configure --enable-warnings --enable-werror --with-openssl ./configure --enable-warnings --enable-werror --with-openssl
install-cares:
steps:
- run:
command: |
sudo apt-get update && sudo apt-get install -y libc-ares-dev
configure-cares:
steps:
- run:
command: |
./buildconf
./configure --enable-warnings --enable-werror --with-openssl --enable-ares
build: build:
steps: steps:
- run: make V=1 - run: make V=1
@ -56,6 +69,15 @@ jobs:
- build - build
- test - test
cares:
executor: ubuntu
steps:
- checkout
- install-cares
- configure-cares
- build
- test
arm: arm:
machine: machine:
image: ubuntu-2004:202101-01 image: ubuntu-2004:202101-01
@ -70,6 +92,11 @@ workflows:
x86-openssl: x86-openssl:
jobs: jobs:
- basic - basic
- cares
openssl-c-ares:
jobs:
- cares
arm-openssl: arm-openssl:
jobs: jobs:

View File

@ -53,18 +53,6 @@
- libbrotli-dev - libbrotli-dev
- libzstd-dev - libzstd-dev
- job:
name: curl-normal-with-openssl-enable-ares
parent: curl-base
vars:
curl_env:
CC: gcc-8
CXX: g++-8
T: normal
C: >-
--with-openssl
--enable-ares
- job: - job:
name: curl-normal-with-openssl-disable-proxy name: curl-normal-with-openssl-disable-proxy
parent: curl-base parent: curl-base
@ -443,7 +431,6 @@
check: check:
jobs: jobs:
- curl-normal-with-openssl-gssapi-libssh2-checksrc - curl-normal-with-openssl-gssapi-libssh2-checksrc
- curl-normal-with-openssl-enable-ares
- curl-normal-with-openssl-disable-proxy - curl-normal-with-openssl-disable-proxy
- curl-normal-with-openssl-disable-verbose-notests - curl-normal-with-openssl-disable-verbose-notests
- curl-novalgrind-boringssl-with-openssl - curl-novalgrind-boringssl-with-openssl