From 476b640fbbece20051fd35458bd9e717c0c45a24 Mon Sep 17 00:00:00 2001
From: lijunlong <lijunlong@openresty.com>
Date: Tue, 20 Aug 2024 10:52:31 +0800
Subject: [PATCH] test: fixed travis.yml.

---
 .travis.yml | 101 ++++++++--------------------------------------------
 1 file changed, 14 insertions(+), 87 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 33640e9..86c1e2d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,15 @@
-dist: bionic
+dist: focal
 
 branches:
   only:
     - "master"
 
 os: linux
+arch:
+  - amd64
+  - arm64
+  - s390x
+  - ppc64le
 
 language: c
 
@@ -17,85 +22,14 @@ addons:
     - axel
     - dos2unix
     - libgd-dev
+    - dos2unix
+    - libpcre3
+    - libpcre3-dev
+    - mercurial
+    - libpq-dev
 
-_linux-s390x: &linux-s390x
-  os: linux
-  arch: s390x
-  dist: bionic
-  compiler: gcc
-  addons:
-      apt:
-          update: true
-          packages:
-            - axel
-            - dos2unix
-            - libgd-dev
-            - libpcre3
-            - libpcre3-dev
-            - mercurial
-            - libpq-dev
-  before_install:
-    - sudo sysctl -w net.ipv6.conf.all.disable_ipv6=1
-  install:
-    - cpanm --sudo --notest Test::Nginx IPC::Run3 > build.log 2>&1 || (cat build.log && exit 1)
-    - if [ ! -f download-cache/openssl-$OPENSSL_VER.tar.gz ]; then wget -P download-cache https://www.openssl.org/source/openssl-$OPENSSL_VER.tar.gz || wget -P download-cache https://www.openssl.org/source/old/${OPENSSL_VER//[a-z]/}/openssl-$OPENSSL_VER.tar.gz; fi
-    - tar zxf download-cache/openssl-$OPENSSL_VER.tar.gz
-    - cd openssl-$OPENSSL_VER/
-    - patch -p1 < ../patches/openssl-$OPENSSL_PATCH_VER-sess_set_get_cb_yield.patch
-    - ./config no-threads shared enable-ssl3 enable-ssl3-method -g --prefix=$OPENSSL_PREFIX -DPURIFY > build.log 2>&1 || (cat build.log && exit 1)
-    - make -j$JOBS > build.log 2>&1 || (cat build.log && exit 1)
-    - sudo make PATH=$PATH install_sw > build.log 2>&1 || (cat build.log && exit 1)
-    - cd ..
-    - sudo ln -s /usr/bin/make /usr/bin/gmake
-  script:
-    - util/mirror-tarballs > build.log 2>&1 || (cat build.log && exit 1)
-    - cd "openresty-$(./util/ver)"
-    - ./configure $ENABLE_HTTP3_OPTION --prefix=$OPENRESTY_PREFIX --with-cc-opt="-I$PCRE_INC -I$OPENSSL_INC" --with-ld-opt="-L$PCRE_LIB -L$OPENSSL_LIB -Wl,-rpath,$PCRE_LIB:$OPENSSL_LIB" --with-pcre-jit --with-http_ssl_module --with-debug -j$JOBS > build.log 2>&1 || (cat build.log && exit 1)
-    - make -j$JOBS > build.log 2>&1 || (cat build.log && exit 1)
-    - sudo make install > build.log 2>&1 || (cat build.log && exit 1)
-    - cd ..
-    - export PATH=$OPENRESTY_PREFIX/bin:$OPENRESTY_PREFIX/nginx/sbin:$PATH
-    - nginx -V
-    - ldd `which nginx`|grep -E 'luajit|ssl|pcre'
-    - prove -I. -r t/
-
-_linux-ppc64le: &linux-ppc64le
-  os: linux
-  arch: ppc64le
-  dist: bionic
-  compiler: gcc
-  addons:
-      apt:
-          update: true
-          packages:
-            - axel
-            - dos2unix
-            - libgd-dev
-            - libpcre3
-            - libpcre3-dev
-            - mercurial
-            - libpq-dev
-  install:
-    - cpanm --sudo --notest Test::Nginx IPC::Run3 > build.log 2>&1 || (cat build.log && exit 1)
-    - if [ ! -f download-cache/openssl-$OPENSSL_VER.tar.gz ]; then wget -P download-cache https://www.openssl.org/source/openssl-$OPENSSL_VER.tar.gz || wget -P download-cache https://www.openssl.org/source/old/${OPENSSL_VER//[a-z]/}/openssl-$OPENSSL_VER.tar.gz; fi
-    - tar zxf download-cache/openssl-$OPENSSL_VER.tar.gz
-    - cd openssl-$OPENSSL_VER/
-    - patch -p1 < ../patches/openssl-$OPENSSL_PATCH_VER-sess_set_get_cb_yield.patch
-    - ./config no-threads shared enable-ssl3 enable-ssl3-method -g --prefix=$OPENSSL_PREFIX -DPURIFY > build.log 2>&1 || (cat build.log && exit 1)
-    - make -j$JOBS > build.log 2>&1 || (cat build.log && exit 1)
-    - sudo make PATH=$PATH install_sw > build.log 2>&1 || (cat build.log && exit 1)
-    - cd ..
-    - sudo ln -s /usr/bin/make /usr/bin/gmake
-  script:
-    - util/mirror-tarballs > build.log 2>&1 || (cat build.log && exit 1)
-    - cd "openresty-$(./util/ver)"
-    - ./configure $ENABLE_HTTP3_OPTION --prefix=$OPENRESTY_PREFIX --with-cc-opt="-I$PCRE_INC -I$OPENSSL_INC" --with-ld-opt="-L$PCRE_LIB -L$OPENSSL_LIB -Wl,-rpath,$PCRE_LIB:$OPENSSL_LIB" --with-pcre-jit --with-http_ssl_module --with-debug -j$JOBS > build.log 2>&1 || (cat build.log && exit 1)
-    - make -j$JOBS > build.log 2>&1 || (cat build.log && exit 1)
-    - sudo make install > build.log 2>&1 || (cat build.log && exit 1)
-    - cd ..
-    - export PATH=$OPENRESTY_PREFIX/bin:$OPENRESTY_PREFIX/nginx/sbin:$PATH
-    - nginx -V
-    - ldd `which nginx`|grep -E 'luajit|ssl|pcre'
+before_install:
+  - sudo sysctl -w net.ipv6.conf.all.disable_ipv6=1
 
 cache:
   directories:
@@ -104,7 +38,7 @@ cache:
 env:
   global:
     - JOBS=3
-    - PCRE_VER=8.44
+    - PCRE_VER=8.45
     - PCRE_PREFIX=/opt/pcre
     - PCRE_LIB=$PCRE_PREFIX/lib
     - PCRE_INC=$PCRE_PREFIX/include
@@ -115,13 +49,6 @@ env:
   jobs:
     - OPENSSL_VER=1.1.1w OPENSSL_PATCH_VER=1.1.1f ENABLE_HTTP3_OPTION=--with-http_v3_module
 
-jobs:
-    include:
-        - <<: *linux-s390x
-          env: OPENSSL_VER=1.1.1w OPENSSL_PATCH_VER=1.1.1f ENABLE_HTTP3_OPTION=--with-http_v3_module
-        - <<: *linux-ppc64le
-          env: OPENSSL_VER=1.1.1w OPENSSL_PATCH_VER=1.1.1f ENABLE_HTTP3_OPTION=--with-http_v3_module
-
 install:
   - cpanm --sudo --notest Test::Nginx IPC::Run3 > build.log 2>&1 || (cat build.log && exit 1)
   - if [ ! -f download-cache/pcre-$PCRE_VER.tar.gz ]; then wget -P download-cache https://downloads.sourceforge.net/project/pcre/pcre/${PCRE_VER}/pcre-${PCRE_VER}.tar.gz; fi