From 340b320a74be5150040477e865e1b8642ebb3bb4 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Tue, 27 Aug 2024 15:22:49 +0200 Subject: [PATCH] ci: update curlver --- .github/workflows/curl-matrix.yml | 174 ------------------------------ scripts/curlver.dist | 13 +-- 2 files changed, 3 insertions(+), 184 deletions(-) diff --git a/.github/workflows/curl-matrix.yml b/.github/workflows/curl-matrix.yml index 4badf17..56e6043 100644 --- a/.github/workflows/curl-matrix.yml +++ b/.github/workflows/curl-matrix.yml @@ -759,177 +759,3 @@ jobs: cd http make -f scripts/ci/Makefile test - curl-7_20_1: - name: curl-7_20_1 - continue-on-error: true - env: - PHP: "8.3" - CURL: "7_20_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-7_20_1 # - - 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-7_19_7: - name: curl-7_19_7 - continue-on-error: true - env: - PHP: "8.3" - CURL: "7_19_7" - 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-7_19_7 # - - 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-7_18_2: - name: curl-7_18_2 - continue-on-error: true - env: - PHP: "8.3" - CURL: "7_18_2" - 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-7_18_2 # - - 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 - diff --git a/scripts/curlver.dist b/scripts/curlver.dist index 6ef35c1..3c967b4 100644 --- a/scripts/curlver.dist +++ b/scripts/curlver.dist @@ -1,19 +1,12 @@ # latest is 8.9.1 ATM # 7.21.5-7.29.0 fail to configure on gh actions -alpine: -centos: -debian: 8.6.0 -fedora: -other: -ubuntu: 8.5.0 - # always test against a few recent latest: master 8.9.1 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 7.78.0 7.76.1 7.61.1 -# and a couple ancient -oldest: 7.18.2 7.19.7 7.20.1 +current: 8.2.1 8.1.1 7.88.1 7.81.0 +# and a couple older +oldest: 7.78.0 7.76.1 7.61.1 # 7.64.1 fails client tests because of superfluous infof() calls # 7.64.0 fails client cookie test because of curl/curl#3613 -- 2.30.2