From efddbd955ca4706f06c461692a561d7d9431adb9 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Tue, 16 Nov 2021 15:07:45 +0100 Subject: [PATCH] ci: update recent curl versions --- .github/workflows/curl-matrix.yml | 74 +++++++++++++++++++++++++++---- scripts/curlver.dist | 5 ++- 2 files changed, 69 insertions(+), 10 deletions(-) diff --git a/.github/workflows/curl-matrix.yml b/.github/workflows/curl-matrix.yml index 3544bda..16ebac1 100644 --- a/.github/workflows/curl-matrix.yml +++ b/.github/workflows/curl-matrix.yml @@ -63,12 +63,12 @@ jobs: cd http make -f scripts/ci/Makefile test - curl-7_78_0: - name: curl-7_78_0 + curl-7_80_0: + name: curl-7_80_0 continue-on-error: true env: PHP: "8.0" - CURL: "7_78_0" + CURL: "7_80_0" enable_debug: "yes" enable_iconv: "yes" with_http_libcurl_dir: "/opt" @@ -82,7 +82,65 @@ jobs: with: repository: curl/curl path: curl - ref: curl-7_78_0 # + ref: curl-7_80_0 # + - name: Install + run: | + echo 'deb-src http://azure.archive.ubuntu.com/ubuntu bionic main' | sudo tee -a /etc/apt/sources.list && \ + echo 'deb-src http://azure.archive.ubuntu.com/ubuntu bionic-updates main' | sudo tee -a /etc/apt/sources.list && \ + sudo apt-get update -y && \ + sudo apt-get build-dep -y libcurl4-openssl-dev && \ + sudo apt-get install -y \ + php-cli \ + php-pear \ + libidn11-dev \ + libidn2-0-dev \ + libicu-dev \ + libevent-dev \ + libbrotli-dev \ + re2c + - name: Curl + run: | + sudo chmod +x /usr/share/libtool/build-aux/ltmain.sh + sudo ln -s /usr/share/libtool/build-aux/ltmain.sh /usr/bin/libtool + cd curl + ./buildconf + ./configure --prefix=/opt --disable-dependency-tracking --with-ssl --with-openssl --without-libssh2 + make -j2 + make install + - name: Prepare + run: | + cd http + make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php + make -f scripts/ci/Makefile pecl PECL=m6w6/ext-raphf.git:raphf:master + - name: Build + run: | + cd http + make -f scripts/ci/Makefile ext PECL=http + - name: Test + run: | + cd http + make -f scripts/ci/Makefile test + + curl-7_79_1: + name: curl-7_79_1 + continue-on-error: true + env: + PHP: "8.0" + CURL: "7_79_1" + enable_debug: "yes" + enable_iconv: "yes" + with_http_libcurl_dir: "/opt" + runs-on: ubuntu-18.04 + steps: + - uses: actions/checkout@v2 + with: + submodules: true + path: http + - uses: actions/checkout@v2 + with: + repository: curl/curl + path: curl + ref: curl-7_79_1 # - name: Install run: | echo 'deb-src http://azure.archive.ubuntu.com/ubuntu bionic main' | sudo tee -a /etc/apt/sources.list && \ @@ -121,12 +179,12 @@ jobs: cd http make -f scripts/ci/Makefile test - curl-7_77_0: - name: curl-7_77_0 + curl-7_78_0: + name: curl-7_78_0 continue-on-error: true env: PHP: "8.0" - CURL: "7_77_0" + CURL: "7_78_0" enable_debug: "yes" enable_iconv: "yes" with_http_libcurl_dir: "/opt" @@ -140,7 +198,7 @@ jobs: with: repository: curl/curl path: curl - ref: curl-7_77_0 # + ref: curl-7_78_0 # - name: Install run: | echo 'deb-src http://azure.archive.ubuntu.com/ubuntu bionic main' | sudo tee -a /etc/apt/sources.list && \ diff --git a/scripts/curlver.dist b/scripts/curlver.dist index b0d22b4..383c739 100644 --- a/scripts/curlver.dist +++ b/scripts/curlver.dist @@ -1,4 +1,4 @@ -# current is 7.78.0 ATM +# current is 7.80.0 ATM # 7.21.5-7.29.0 fail to configure on gh actions alpine: 7.78.0 7.67.0 @@ -9,7 +9,8 @@ other: 7.49.1 7.31.0 ubuntu: 7.74.0 7.68.0 7.58.0 # always test against a few recent -latest: master 7.78.0 7.77.0 7.76.1 +latest: master 7.80.0 7.79.1 +# and a couple ancient oldest: 7.18.2 7.19.7 7.20.1 # 7.64.1 fails client tests because of superfluous infof() calls -- 2.30.2