From 9288cbec440b9ac839e5285d059c1ca4bbefb07f Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Tue, 24 Sep 2024 20:08:49 +0200 Subject: [PATCH] curl: test against recent releases --- .github/workflows/curl-matrix.yml | 66 ++----------------------------- scripts/curlver.dist | 2 +- 2 files changed, 5 insertions(+), 63 deletions(-) diff --git a/.github/workflows/curl-matrix.yml b/.github/workflows/curl-matrix.yml index c409a4a..3748166 100644 --- a/.github/workflows/curl-matrix.yml +++ b/.github/workflows/curl-matrix.yml @@ -121,12 +121,12 @@ jobs: cd http make -f scripts/ci/Makefile test - curl-8_10_0: - name: curl-8_10_0 + curl-8_9_0: + name: curl-8_9_0 continue-on-error: true env: PHP: "8.3" - CURL: "8_10_0" + CURL: "8_9_0" enable_debug: "yes" enable_iconv: "yes" with_http_libcurl_dir: "/opt" @@ -140,65 +140,7 @@ jobs: with: repository: curl/curl path: curl - ref: curl-8_10_0 # - - name: Install - run: | - echo 'deb-src http://azure.archive.ubuntu.com/ubuntu jammy main' | sudo tee -a /etc/apt/sources.list && \ - echo 'deb-src http://azure.archive.ubuntu.com/ubuntu jammy-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 --disable-ldap - 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-8_9_1: - name: curl-8_9_1 - continue-on-error: true - env: - PHP: "8.3" - CURL: "8_9_1" - enable_debug: "yes" - enable_iconv: "yes" - with_http_libcurl_dir: "/opt" - runs-on: ubuntu-24.04 - steps: - - uses: actions/checkout@v2 - with: - submodules: true - path: http - - uses: actions/checkout@v2 - with: - repository: curl/curl - path: curl - ref: curl-8_9_1 # + ref: curl-8_9_0 # - name: Install run: | echo 'deb-src http://azure.archive.ubuntu.com/ubuntu jammy main' | sudo tee -a /etc/apt/sources.list && \ diff --git a/scripts/curlver.dist b/scripts/curlver.dist index 2a312a2..4a78eda 100644 --- a/scripts/curlver.dist +++ b/scripts/curlver.dist @@ -2,7 +2,7 @@ # 7.21.5-7.29.0 fail to configure on gh actions # always test against a few recent -latest: master 8.10.1 8.10.0 8.9.1 8.8.0 8.7.1 8.6.0 8.5.0 +latest: master 8.10.1 8.9.0 8.8.0 8.7.1 8.6.0 8.5.0 # various linux distros current: 8.2.1 8.1.1 7.88.1 7.81.0 # and a couple older -- 2.30.2