ci: test against 7.81

diff --git a/.github/Makefile b/.github/Makefile
new file mode 100644 (file)
index 0000000..29166f3
--- /dev/null
+++ b/.github/Makefile
@@ -0,0 +1,8 @@
+.PHONY: all
+all: workflows/ci.yml
+all: workflows/curl-matrix.yml
+
+workflows/%.yml: ../scripts/gen_github_workflow_%.php
+       $<>$@
+
+workflows/curl-matrix.yml: ../scripts/curlver.dist

diff --git a/.github/workflows/curl-matrix.yml b/.github/workflows/curl-matrix.yml
index 16ebac197db611307b312f98c4ddd58645341cdf..d66ececdda5d7b2e4b0c2c3e3ff7273ca1a4b445 100644 (file)
--- a/.github/workflows/curl-matrix.yml
+++ b/.github/workflows/curl-matrix.yml
@@ -63,6 +63,64 @@ jobs:
           cd http
           make -f scripts/ci/Makefile test
 
           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
   curl-7_80_0:
     name: curl-7_80_0
     continue-on-error: true

diff --git a/.gitignore b/.gitignore
index 1d981fb5ff3174373a9f63defb7fd0ab6805fe14..a20dd1db17a828e3dae721d97e4b70a56fbac4d6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@
 *.dep
 .libs/
 .project
 *.dep
 .libs/
 .project

-Makefile
+/Makefile

 Makefile.fragments
 Makefile.global
 Makefile.objects
 Makefile.fragments
 Makefile.global
 Makefile.objects


@@ -11,6 +11,7 @@ acinclude.m4
 aclocal.m4
 autom4te.cache/
 build/
 aclocal.m4
 autom4te.cache/
 build/

+config.cache

 config.guess
 config.h
 config.h.in
 config.guess
 config.h
 config.h.in


@@ -19,6 +20,7 @@ config.nice
 config.status
 config.sub
 configure
 config.status
 config.sub
 configure

+configure.ac

 configure.in
 http.la
 install-sh
 configure.in
 http.la
 install-sh

diff --git a/scripts/curlver.dist b/scripts/curlver.dist
index 383c73914ba00d1586966f0065667f1ef45e3d62..829777bd7c9a5547b57690314c6f07e9bcf79a98 100644 (file)
--- a/scripts/curlver.dist
+++ b/scripts/curlver.dist
@@ -1,4 +1,4 @@
-# current is 7.80.0 ATM
+# current is 7.81.0 ATM

 # 7.21.5-7.29.0 fail to configure on gh actions
 
 alpine: 7.78.0 7.67.0
 # 7.21.5-7.29.0 fail to configure on gh actions
 
 alpine: 7.78.0 7.67.0


@@ -9,7 +9,7 @@ other: 7.49.1 7.31.0
 ubuntu: 7.74.0 7.68.0 7.58.0
 
 # always test against a few recent
 ubuntu: 7.74.0 7.68.0 7.58.0
 
 # always test against a few recent

-latest: master 7.80.0 7.79.1
+latest: master 7.81.0 7.80.0 7.79.1

 # and a couple ancient
 oldest: 7.18.2 7.19.7 7.20.1
 
 # and a couple ancient
 oldest: 7.18.2 7.19.7 7.20.1