From 6d755d36c3b140d60b2eef577d90cacee656a7ed Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Wed, 24 May 2023 12:57:19 +0200 Subject: [PATCH] ci: update versions --- .github/workflows/ci.yml | 173 +++++--- .github/workflows/curl-matrix.yml | 446 +++++--------------- scripts/curlver.dist | 12 +- scripts/gen_github_workflow_ci.php | 20 +- scripts/gen_github_workflow_curl-matrix.php | 8 +- 5 files changed, 251 insertions(+), 408 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2ed701c..e04f594 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,25 +8,29 @@ on: jobs: next-0: - name: "next-0 (8.1)" + name: "next-0 (master)" + continue-on-error: true env: - PHP: "8.1" + PHP: "master" enable_debug: "yes" enable_zts: "yes" enable_iconv: "yes" TEST_PHP_ARGS: "-d error_reporting=24575" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true + - name: Info + run: | + locale -a && locale - name: Install run: | sudo apt-get install -y \ php-cli \ php-pear \ libcurl4-openssl-dev \ - libidn11-dev \ + libidn-dev \ libidn2-0-dev \ libicu-dev \ libevent-dev \ @@ -43,27 +47,28 @@ jobs: run: | make -f scripts/ci/Makefile test - next-1: - name: "next-1 (master)" - continue-on-error: true + old-0: + name: "old-0 (8.1)" env: - PHP: "master" + PHP: "8.1" enable_debug: "yes" enable_zts: "yes" enable_iconv: "yes" - TEST_PHP_ARGS: "-d error_reporting=24575" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true + - name: Info + run: | + locale -a && locale - name: Install run: | sudo apt-get install -y \ php-cli \ php-pear \ libcurl4-openssl-dev \ - libidn11-dev \ + libidn-dev \ libidn2-0-dev \ libicu-dev \ libevent-dev \ @@ -80,28 +85,69 @@ jobs: run: | make -f scripts/ci/Makefile test - cur-none-0: - name: "cur-none-0 (8.0)" + old-1: + name: "old-1 (8.0)" env: PHP: "8.0" + enable_debug: "yes" + enable_zts: "yes" + enable_iconv: "yes" + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@v3 + with: + submodules: true + - name: Info + run: | + locale -a && locale + - name: Install + run: | + sudo apt-get install -y \ + php-cli \ + php-pear \ + libcurl4-openssl-dev \ + libidn-dev \ + libidn2-0-dev \ + libicu-dev \ + libevent-dev \ + libbrotli-dev \ + re2c + - name: Prepare + run: | + 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: | + make -f scripts/ci/Makefile ext PECL=http + - name: Test + run: | + make -f scripts/ci/Makefile test + + cur-none-0: + name: "cur-none-0 (8.2)" + env: + PHP: "8.2" with_http_libicu_dir: "no" with_http_libidn_dir: "no" with_http_libidn2_dir: "no" with_http_libcurl_dir: "no" with_http_libevent_dir: "no" with_http_libbrotli_dir: "no" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true + - name: Info + run: | + locale -a && locale - name: Install run: | sudo apt-get install -y \ php-cli \ php-pear \ libcurl4-openssl-dev \ - libidn11-dev \ + libidn-dev \ libidn2-0-dev \ libicu-dev \ libevent-dev \ @@ -119,24 +165,27 @@ jobs: make -f scripts/ci/Makefile test cur-dbg-zts-0: - name: "cur-dbg-zts-0 (8.0)" + name: "cur-dbg-zts-0 (8.2)" env: - PHP: "8.0" + PHP: "8.2" enable_debug: "yes" enable_zts: "yes" enable_iconv: "yes" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true + - name: Info + run: | + locale -a && locale - name: Install run: | sudo apt-get install -y \ php-cli \ php-pear \ libcurl4-openssl-dev \ - libidn11-dev \ + libidn-dev \ libidn2-0-dev \ libicu-dev \ libevent-dev \ @@ -154,24 +203,27 @@ jobs: make -f scripts/ci/Makefile test cur-dbg-zts-1: - name: "cur-dbg-zts-1 (8.0)" + name: "cur-dbg-zts-1 (8.2)" env: - PHP: "8.0" + PHP: "8.2" enable_debug: "no" enable_zts: "yes" enable_iconv: "yes" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true + - name: Info + run: | + locale -a && locale - name: Install run: | sudo apt-get install -y \ php-cli \ php-pear \ libcurl4-openssl-dev \ - libidn11-dev \ + libidn-dev \ libidn2-0-dev \ libicu-dev \ libevent-dev \ @@ -189,24 +241,27 @@ jobs: make -f scripts/ci/Makefile test cur-dbg-zts-2: - name: "cur-dbg-zts-2 (8.0)" + name: "cur-dbg-zts-2 (8.2)" env: - PHP: "8.0" + PHP: "8.2" enable_debug: "yes" enable_zts: "no" enable_iconv: "yes" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true + - name: Info + run: | + locale -a && locale - name: Install run: | sudo apt-get install -y \ php-cli \ php-pear \ libcurl4-openssl-dev \ - libidn11-dev \ + libidn-dev \ libidn2-0-dev \ libicu-dev \ libevent-dev \ @@ -224,24 +279,27 @@ jobs: make -f scripts/ci/Makefile test cur-dbg-zts-3: - name: "cur-dbg-zts-3 (8.0)" + name: "cur-dbg-zts-3 (8.2)" env: - PHP: "8.0" + PHP: "8.2" enable_debug: "no" enable_zts: "no" enable_iconv: "yes" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true + - name: Info + run: | + locale -a && locale - name: Install run: | sudo apt-get install -y \ php-cli \ php-pear \ libcurl4-openssl-dev \ - libidn11-dev \ + libidn-dev \ libidn2-0-dev \ libicu-dev \ libevent-dev \ @@ -259,27 +317,30 @@ jobs: make -f scripts/ci/Makefile test cur-cov-0: - name: "cur-cov-0 (8.0)" + name: "cur-cov-0 (8.2)" env: CFLAGS: "-O0 -g --coverage" CXXFLAGS: "-O0 -g --coverage" - PHP: "8.0" + PHP: "8.2" enable_iconv: "yes" with_http_libicu_dir: "yes" with_http_libidn_dir: "no" with_http_libidn2_dir: "no" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true + - name: Info + run: | + locale -a && locale - name: Install run: | sudo apt-get install -y \ php-cli \ php-pear \ libcurl4-openssl-dev \ - libidn11-dev \ + libidn-dev \ libidn2-0-dev \ libicu-dev \ libevent-dev \ @@ -302,27 +363,30 @@ jobs: bash <(curl -s https://codecov.io/bash) -X xcode -X coveragepy cur-cov-1: - name: "cur-cov-1 (8.0)" + name: "cur-cov-1 (8.2)" env: CFLAGS: "-O0 -g --coverage" CXXFLAGS: "-O0 -g --coverage" - PHP: "8.0" + PHP: "8.2" enable_iconv: "yes" with_http_libicu_dir: "no" with_http_libidn_dir: "yes" with_http_libidn2_dir: "no" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true + - name: Info + run: | + locale -a && locale - name: Install run: | sudo apt-get install -y \ php-cli \ php-pear \ libcurl4-openssl-dev \ - libidn11-dev \ + libidn-dev \ libidn2-0-dev \ libicu-dev \ libevent-dev \ @@ -345,27 +409,30 @@ jobs: bash <(curl -s https://codecov.io/bash) -X xcode -X coveragepy cur-cov-2: - name: "cur-cov-2 (8.0)" + name: "cur-cov-2 (8.2)" env: CFLAGS: "-O0 -g --coverage" CXXFLAGS: "-O0 -g --coverage" - PHP: "8.0" + PHP: "8.2" enable_iconv: "yes" with_http_libicu_dir: "no" with_http_libidn_dir: "no" with_http_libidn2_dir: "yes" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true + - name: Info + run: | + locale -a && locale - name: Install run: | sudo apt-get install -y \ php-cli \ php-pear \ libcurl4-openssl-dev \ - libidn11-dev \ + libidn-dev \ libidn2-0-dev \ libicu-dev \ libevent-dev \ diff --git a/.github/workflows/curl-matrix.yml b/.github/workflows/curl-matrix.yml index d66ecec..a37e548 100644 --- a/.github/workflows/curl-matrix.yml +++ b/.github/workflows/curl-matrix.yml @@ -10,12 +10,12 @@ jobs: name: curl-master continue-on-error: true env: - PHP: "8.0" + PHP: "8.2" CURL: "master" enable_debug: "yes" enable_iconv: "yes" with_http_libcurl_dir: "/opt" - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: @@ -27,8 +27,8 @@ jobs: path: curl - 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 && \ + 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 \ @@ -46,7 +46,7 @@ jobs: 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 + ./configure --prefix=/opt --disable-dependency-tracking --with-ssl --with-openssl --without-libssh2 --disable-ldap make -j2 make install - name: Prepare @@ -63,132 +63,16 @@ jobs: cd http make -f scripts/ci/Makefile test - curl-7_81_0: - name: curl-7_81_0 - continue-on-error: true - env: - PHP: "8.0" - CURL: "7_81_0" - 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_81_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_80_0: - name: curl-7_80_0 - continue-on-error: true - env: - PHP: "8.0" - CURL: "7_80_0" - 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_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 + curl-8_1_1: + name: curl-8_1_1 continue-on-error: true env: - PHP: "8.0" - CURL: "7_79_1" + PHP: "8.2" + CURL: "8_1_1" enable_debug: "yes" enable_iconv: "yes" with_http_libcurl_dir: "/opt" - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: @@ -198,11 +82,11 @@ jobs: with: repository: curl/curl path: curl - ref: curl-7_79_1 # + ref: curl-8_1_1 # - 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 && \ + 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 \ @@ -220,7 +104,7 @@ jobs: 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 + ./configure --prefix=/opt --disable-dependency-tracking --with-ssl --with-openssl --without-libssh2 --disable-ldap make -j2 make install - name: Prepare @@ -237,16 +121,16 @@ jobs: cd http make -f scripts/ci/Makefile test - curl-7_78_0: - name: curl-7_78_0 + curl-8_0_1: + name: curl-8_0_1 continue-on-error: true env: - PHP: "8.0" - CURL: "7_78_0" + PHP: "8.2" + CURL: "8_0_1" enable_debug: "yes" enable_iconv: "yes" with_http_libcurl_dir: "/opt" - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: @@ -256,11 +140,11 @@ jobs: with: repository: curl/curl path: curl - ref: curl-7_78_0 # + ref: curl-8_0_1 # - 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 && \ + 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 \ @@ -278,7 +162,7 @@ jobs: 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 + ./configure --prefix=/opt --disable-dependency-tracking --with-ssl --with-openssl --without-libssh2 --disable-ldap make -j2 make install - name: Prepare @@ -295,16 +179,16 @@ jobs: cd http make -f scripts/ci/Makefile test - curl-7_76_1: - name: curl-7_76_1 + curl-7_88_1: + name: curl-7_88_1 continue-on-error: true env: - PHP: "8.0" - CURL: "7_76_1" + PHP: "8.2" + CURL: "7_88_1" enable_debug: "yes" enable_iconv: "yes" with_http_libcurl_dir: "/opt" - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: @@ -314,11 +198,11 @@ jobs: with: repository: curl/curl path: curl - ref: curl-7_76_1 # + ref: curl-7_88_1 # - 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 && \ + 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 \ @@ -336,7 +220,7 @@ jobs: 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 + ./configure --prefix=/opt --disable-dependency-tracking --with-ssl --with-openssl --without-libssh2 --disable-ldap make -j2 make install - name: Prepare @@ -353,16 +237,16 @@ jobs: cd http make -f scripts/ci/Makefile test - curl-7_74_0: - name: curl-7_74_0 + curl-7_87_0: + name: curl-7_87_0 continue-on-error: true env: - PHP: "8.0" - CURL: "7_74_0" + PHP: "8.2" + CURL: "7_87_0" enable_debug: "yes" enable_iconv: "yes" with_http_libcurl_dir: "/opt" - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: @@ -372,11 +256,11 @@ jobs: with: repository: curl/curl path: curl - ref: curl-7_74_0 # + ref: curl-7_87_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 && \ + 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 \ @@ -394,7 +278,7 @@ jobs: 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 + ./configure --prefix=/opt --disable-dependency-tracking --with-ssl --with-openssl --without-libssh2 --disable-ldap make -j2 make install - name: Prepare @@ -411,16 +295,16 @@ jobs: cd http make -f scripts/ci/Makefile test - curl-7_71_1: - name: curl-7_71_1 + curl-7_85_0: + name: curl-7_85_0 continue-on-error: true env: - PHP: "8.0" - CURL: "7_71_1" + PHP: "8.2" + CURL: "7_85_0" enable_debug: "yes" enable_iconv: "yes" with_http_libcurl_dir: "/opt" - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: @@ -430,11 +314,11 @@ jobs: with: repository: curl/curl path: curl - ref: curl-7_71_1 # + ref: curl-7_85_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 && \ + 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 \ @@ -452,7 +336,7 @@ jobs: 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 + ./configure --prefix=/opt --disable-dependency-tracking --with-ssl --with-openssl --without-libssh2 --disable-ldap make -j2 make install - name: Prepare @@ -469,16 +353,16 @@ jobs: cd http make -f scripts/ci/Makefile test - curl-7_68_0: - name: curl-7_68_0 + curl-7_81_0: + name: curl-7_81_0 continue-on-error: true env: - PHP: "8.0" - CURL: "7_68_0" + PHP: "8.2" + CURL: "7_81_0" enable_debug: "yes" enable_iconv: "yes" with_http_libcurl_dir: "/opt" - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: @@ -488,11 +372,11 @@ jobs: with: repository: curl/curl path: curl - ref: curl-7_68_0 # + ref: curl-7_81_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 && \ + 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 \ @@ -510,7 +394,7 @@ jobs: 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 + ./configure --prefix=/opt --disable-dependency-tracking --with-ssl --with-openssl --without-libssh2 --disable-ldap make -j2 make install - name: Prepare @@ -527,16 +411,16 @@ jobs: cd http make -f scripts/ci/Makefile test - curl-7_67_0: - name: curl-7_67_0 + curl-7_78_0: + name: curl-7_78_0 continue-on-error: true env: - PHP: "8.0" - CURL: "7_67_0" + PHP: "8.2" + CURL: "7_78_0" enable_debug: "yes" enable_iconv: "yes" with_http_libcurl_dir: "/opt" - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: @@ -546,11 +430,11 @@ jobs: with: repository: curl/curl path: curl - ref: curl-7_67_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 && \ - echo 'deb-src http://azure.archive.ubuntu.com/ubuntu bionic-updates main' | sudo tee -a /etc/apt/sources.list && \ + 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 \ @@ -568,7 +452,7 @@ jobs: 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 + ./configure --prefix=/opt --disable-dependency-tracking --with-ssl --with-openssl --without-libssh2 --disable-ldap make -j2 make install - name: Prepare @@ -585,16 +469,16 @@ jobs: cd http make -f scripts/ci/Makefile test - curl-7_64_0: - name: curl-7_64_0 + curl-7_74_0: + name: curl-7_74_0 continue-on-error: true env: - PHP: "8.0" - CURL: "7_64_0" + PHP: "8.2" + CURL: "7_74_0" enable_debug: "yes" enable_iconv: "yes" with_http_libcurl_dir: "/opt" - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: @@ -604,11 +488,11 @@ jobs: with: repository: curl/curl path: curl - ref: curl-7_64_0 # + ref: curl-7_74_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 && \ + 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 \ @@ -626,7 +510,7 @@ jobs: 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 + ./configure --prefix=/opt --disable-dependency-tracking --with-ssl --with-openssl --without-libssh2 --disable-ldap make -j2 make install - name: Prepare @@ -647,12 +531,12 @@ jobs: name: curl-7_61_1 continue-on-error: true env: - PHP: "8.0" + PHP: "8.2" CURL: "7_61_1" enable_debug: "yes" enable_iconv: "yes" with_http_libcurl_dir: "/opt" - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: @@ -665,124 +549,8 @@ jobs: ref: curl-7_61_1 # - 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_58_0: - name: curl-7_58_0 - continue-on-error: true - env: - PHP: "8.0" - CURL: "7_58_0" - 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_58_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_52_1: - name: curl-7_52_1 - continue-on-error: true - env: - PHP: "8.0" - CURL: "7_52_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_52_1 # - - 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 && \ + 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 \ @@ -800,7 +568,7 @@ jobs: 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 + ./configure --prefix=/opt --disable-dependency-tracking --with-ssl --with-openssl --without-libssh2 --disable-ldap make -j2 make install - name: Prepare @@ -821,12 +589,12 @@ jobs: name: curl-7_49_1 continue-on-error: true env: - PHP: "8.0" + PHP: "8.2" CURL: "7_49_1" enable_debug: "yes" enable_iconv: "yes" with_http_libcurl_dir: "/opt" - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: @@ -839,8 +607,8 @@ jobs: ref: curl-7_49_1 # - 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 && \ + 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 \ @@ -858,7 +626,7 @@ jobs: 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 + ./configure --prefix=/opt --disable-dependency-tracking --with-ssl --with-openssl --without-libssh2 --disable-ldap make -j2 make install - name: Prepare @@ -879,12 +647,12 @@ jobs: name: curl-7_31_0 continue-on-error: true env: - PHP: "8.0" + PHP: "8.2" CURL: "7_31_0" enable_debug: "yes" enable_iconv: "yes" with_http_libcurl_dir: "/opt" - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: @@ -897,8 +665,8 @@ jobs: ref: curl-7_31_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 && \ + 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 \ @@ -916,7 +684,7 @@ jobs: 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 + ./configure --prefix=/opt --disable-dependency-tracking --with-ssl --with-openssl --without-libssh2 --disable-ldap make -j2 make install - name: Prepare @@ -937,12 +705,12 @@ jobs: name: curl-7_20_1 continue-on-error: true env: - PHP: "8.0" + PHP: "8.2" CURL: "7_20_1" enable_debug: "yes" enable_iconv: "yes" with_http_libcurl_dir: "/opt" - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: @@ -955,8 +723,8 @@ jobs: ref: curl-7_20_1 # - 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 && \ + 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 \ @@ -974,7 +742,7 @@ jobs: 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 + ./configure --prefix=/opt --disable-dependency-tracking --with-ssl --with-openssl --without-libssh2 --disable-ldap make -j2 make install - name: Prepare @@ -995,12 +763,12 @@ jobs: name: curl-7_19_7 continue-on-error: true env: - PHP: "8.0" + PHP: "8.2" CURL: "7_19_7" enable_debug: "yes" enable_iconv: "yes" with_http_libcurl_dir: "/opt" - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: @@ -1013,8 +781,8 @@ jobs: ref: curl-7_19_7 # - 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 && \ + 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 \ @@ -1032,7 +800,7 @@ jobs: 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 + ./configure --prefix=/opt --disable-dependency-tracking --with-ssl --with-openssl --without-libssh2 --disable-ldap make -j2 make install - name: Prepare @@ -1053,12 +821,12 @@ jobs: name: curl-7_18_2 continue-on-error: true env: - PHP: "8.0" + PHP: "8.2" CURL: "7_18_2" enable_debug: "yes" enable_iconv: "yes" with_http_libcurl_dir: "/opt" - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: @@ -1071,8 +839,8 @@ jobs: ref: curl-7_18_2 # - 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 && \ + 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 \ @@ -1090,7 +858,7 @@ jobs: 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 + ./configure --prefix=/opt --disable-dependency-tracking --with-ssl --with-openssl --without-libssh2 --disable-ldap make -j2 make install - name: Prepare diff --git a/scripts/curlver.dist b/scripts/curlver.dist index 829777b..416cb07 100644 --- a/scripts/curlver.dist +++ b/scripts/curlver.dist @@ -1,15 +1,15 @@ -# current is 7.81.0 ATM +# current is 8.1.1 ATM # 7.21.5-7.29.0 fail to configure on gh actions -alpine: 7.78.0 7.67.0 +alpine: 8.1.1 7.78.0 centos: 7.61.1 # 7.29.0 -debian: 7.74.0 7.64.0 7.52.1 -fedora: 7.78.0 7.76.1 7.71.1 +debian: 7.88.1 7.74.0 +fedora: 7.87.0 7.85.0 other: 7.49.1 7.31.0 -ubuntu: 7.74.0 7.68.0 7.58.0 +ubuntu: 7.81.0 7.74.0 # always test against a few recent -latest: master 7.81.0 7.80.0 7.79.1 +latest: master 8.1.1 8.0.1 7.88.1 7.81.0 # and a couple ancient oldest: 7.18.2 7.19.7 7.20.1 diff --git a/scripts/gen_github_workflow_ci.php b/scripts/gen_github_workflow_ci.php index c23f23e..41ce95f 100755 --- a/scripts/gen_github_workflow_ci.php +++ b/scripts/gen_github_workflow_ci.php @@ -11,16 +11,21 @@ jobs: github([ "next" => [ -// most useful for all additional versions except current - "PHP" => ["8.1", "master"], + "PHP" => ["master"], "enable_debug" => "yes", "enable_zts" => "yes", "enable_iconv" => "yes", "TEST_PHP_ARGS" => "-d error_reporting=24575" // ignore E_DEPRECATED ], +"old" => [ + "PHP" => ["8.1", "8.0"], + "enable_debug" => "yes", + "enable_zts" => "yes", + "enable_iconv" => "yes", +], "cur-none" => [ // everything disabled for current "PHP" => $cur, @@ -62,18 +67,21 @@ foreach ($job as $id => $env) { printf(" %s: \"%s\"\n", $key, $val); } ?> - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true + - name: Info + run: | + locale -a && locale - name: Install run: | sudo apt-get install -y \ php-cli \ php-pear \ libcurl4-openssl-dev \ - libidn11-dev \ + libidn-dev \ libidn2-0-dev \ libicu-dev \ libevent-dev \ diff --git a/scripts/gen_github_workflow_curl-matrix.php b/scripts/gen_github_workflow_curl-matrix.php index 66b50c9..be6748b 100755 --- a/scripts/gen_github_workflow_curl-matrix.php +++ b/scripts/gen_github_workflow_curl-matrix.php @@ -34,7 +34,7 @@ rsort($curlver, SORT_NATURAL); $gen = include __DIR__ . "/ci/gen-matrix.php"; $job = $gen->github([ "curl" => [ - "PHP" => "8.0", + "PHP" => "8.2", "CURL" => $curlver, "enable_debug" => "yes", "enable_iconv" => "yes", @@ -49,7 +49,7 @@ foreach ($job as $id => $env) { printf(" %s: \"%s\"\n", $key, $val); } ?> - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: @@ -64,8 +64,8 @@ foreach ($job as $id => $env) { - 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 && \ + 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 \ -- 2.30.2