bugfix: dist-check: avoid killall nginx.

upgraded luajit2 to 2.1-20230410. (#903 )
rc1 comes first.
2024-10-13 00:29:41 +00:00 · 2023-04-17 10:24:06 -07:00 · 2023-04-14 17:02:57 +08:00 · 2023-03-30 15:44:48 -07:00 · 2023-03-23 18:23:03 +08:00 · 2023-03-08 15:23:08 -08:00
8 changed files with 1032 additions and 757 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -12,7 +12,6 @@ addons:
    packages:
    - axel
    - dos2unix
-    - cpanminus
    - libgd-dev

 _linux-s390x: &linux-s390x
@ -26,14 +25,15 @@ _linux-s390x: &linux-s390x
          packages:
            - axel
            - dos2unix
-            - cpanminus
            - libgd-dev
            - libpcre3
            - libpcre3-dev
            - mercurial
            - libpq-dev
+  before_install:
+    - sudo sysctl -w net.ipv6.conf.all.disable_ipv6=1
  install:
-    - sudo cpanm --notest Test::Nginx IPC::Run3 > build.log 2>&1 || (cat build.log && exit 1)
+    - 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/
@ -66,14 +66,13 @@ _linux-ppc64le: &linux-ppc64le
          packages:
            - axel
            - dos2unix
-            - cpanminus
            - libgd-dev
            - libpcre3
            - libpcre3-dev
            - mercurial
            - libpq-dev
  install:
-    - sudo cpanm --notest Test::Nginx IPC::Run3 > build.log 2>&1 || (cat build.log && exit 1)
+    - 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/
@ -111,7 +110,7 @@ env:
    - OPENRESTY_PREFIX=/opt/openresty
  jobs:
    - OPENSSL_VER=1.1.0l OPENSSL_PATCH_VER=1.1.0d
-    - OPENSSL_VER=1.1.1p OPENSSL_PATCH_VER=1.1.1f
+    - OPENSSL_VER=1.1.1s OPENSSL_PATCH_VER=1.1.1f

 jobs:
    include:
@ -120,10 +119,10 @@ jobs:
        - <<: *linux-s390x
          env: OPENSSL_VER=1.1.1l OPENSSL_PATCH_VER=1.1.1f
        - <<: *linux-ppc64le
-          env: OPENSSL_VER=1.1.1p OPENSSL_PATCH_VER=1.1.1f
+          env: OPENSSL_VER=1.1.1s OPENSSL_PATCH_VER=1.1.1f

 install:
-  - sudo cpanm --notest Test::Nginx IPC::Run3 > build.log 2>&1 || (cat build.log && exit 1)
+  - 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
  - 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/pcre-$PCRE_VER.tar.gz
--- a/html/50x.html
+++ b/html/50x.html
--- a/html/index.html
+++ b/html/index.html
--- a/t/000-sanity.t
+++ b/t/000-sanity.t
--- a/util/build-win32.sh
+++ b/util/build-win32.sh
@ -1,8 +1,8 @@
 #!/bin/bash

-PCRE=pcre-8.44
-ZLIB=zlib-1.2.12
-OPENSSL=openssl-1.1.1p
+PCRE=pcre-8.45
+ZLIB=zlib-1.2.13
+OPENSSL=openssl-1.1.1t
 JOBS=12

 # wget https://www.openssl.org/source/openssl-1.1.1p.tar.gz
--- a/util/dist-check
+++ b/util/dist-check
@ -86,7 +86,7 @@ sh "sudo $make install";
 sh "sudo cp /tmp/nginx.conf $prefix/nginx/conf/nginx.conf";
 sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep $ver";
 sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep -v 'stream_proxy'";
-system "sudo killall nginx > /dev/null 2>&1";
+#system "sudo killall nginx > /dev/null 2>&1";
 sh "sudo $prefix/nginx/sbin/nginx";
 sh "curl -si localhost/lua|grep $lua";
 sh "curl -si localhost/lua|grep $ver";
--- a/util/mirror-tarballs
+++ b/util/mirror-tarballs
@ -589,7 +589,7 @@ mv openresty-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1

 #################################

-ver=0.10.23rc1
+ver=0.10.24
 $root/util/get-tarball "https://github.com/openresty/lua-nginx-module/archive/v$ver.tar.gz" -O lua-nginx-module-$ver.tar.gz || exit 1
 tar -xzf lua-nginx-module-$ver.tar.gz || exit 1
 mv lua-nginx-module-$ver ngx_lua-$ver || exit 1
@ -603,7 +603,7 @@ mv openresty-lua-upstream-nginx-module-* ngx_lua_upstream-$ver || exit 1

 #################################

-ver=0.0.12rc1
+ver=0.0.13
 $root/util/get-tarball "https://github.com/openresty/stream-lua-nginx-module/tarball/v$ver" -O stream-lua-nginx-module-$ver.tar.gz || exit 1
 tar -xzf stream-lua-nginx-module-$ver.tar.gz || exit 1
 mv openresty-stream-lua-nginx-module-* ngx_stream_lua-$ver || exit 1
@ -624,7 +624,7 @@ mv openresty-memc-nginx-module-* memc-nginx-module-$ver || exit 1

 #################################

-ver=0.33rc1
+ver=0.33
 $root/util/get-tarball "https://github.com/openresty/srcache-nginx-module/tarball/v$ver" -O srcache-nginx-module-$ver.tar.gz || exit 1
 tar -xzf srcache-nginx-module-$ver.tar.gz || exit 1
 mv openresty-srcache-nginx-module-* srcache-nginx-module-$ver || exit 1
@ -714,7 +714,7 @@ mv openresty-opm-* opm-$ver || exit 1

 #################################

-ver=2.1-20230119
+ver=2.1-20230410
 $root/util/get-tarball "https://github.com/openresty/luajit2/archive/v$ver.tar.gz" -O "LuaJIT-$ver.tar.gz" || exit 1
 tar -xzf LuaJIT-$ver.tar.gz || exit 1
 mv luajit2-* LuaJIT-$ver || exit 1
@ -761,7 +761,7 @@ cd ..

 #################################

-ver=0.17rc1
+ver=0.17
 $root/util/get-tarball "https://github.com/openresty/lua-resty-memcached/tarball/v$ver" -O "lua-resty-memcached-$ver.tar.gz" || exit 1
 tar -xzf lua-resty-memcached-$ver.tar.gz || exit 1
 mv openresty-lua-resty-memcached-* lua-resty-memcached-$ver || exit 1
@ -779,7 +779,7 @@ mv openresty-lua-resty-redis-* lua-resty-redis-$ver || exit 1

 #################################

-ver=0.26rc1
+ver=0.26
 $root/util/get-tarball "https://github.com/openresty/lua-resty-mysql/tarball/v$ver" -O "lua-resty-mysql-$ver.tar.gz" || exit 1
 tar -xzf lua-resty-mysql-$ver.tar.gz || exit 1
 mv openresty-lua-resty-mysql-* lua-resty-mysql-$ver || exit 1
@ -801,7 +801,7 @@ cd ..

 #################################

-ver=0.11rc1
+ver=0.11
 $root/util/get-tarball "https://github.com/openresty/lua-resty-upload/tarball/v$ver" -O "lua-resty-upload-$ver.tar.gz" || exit 1
 tar -xzf lua-resty-upload-$ver.tar.gz || exit 1
 mv openresty-lua-resty-upload-* lua-resty-upload-$ver || exit 1
@ -823,7 +823,7 @@ cd ..

 #################################

-ver=0.10rc1
+ver=0.10
 $root/util/get-tarball "https://github.com/openresty/lua-resty-websocket/tarball/v$ver" -O "lua-resty-websocket-$ver.tar.gz" || exit 1
 tar -xzf lua-resty-websocket-$ver.tar.gz || exit 1
 mv openresty-lua-resty-websocket-* lua-resty-websocket-$ver || exit 1
@ -856,14 +856,14 @@ cd ..

 #################################

-ver=0.1.25rc1
+ver=0.1.26
 $root/util/get-tarball "https://github.com/openresty/lua-resty-core/tarball/v$ver" -O "lua-resty-core-$ver.tar.gz" || exit 1
 tar -xzf lua-resty-core-$ver.tar.gz || exit 1
 mv openresty-lua-resty-core-* lua-resty-core-$ver || exit 1

 #################################

-ver=0.07
+ver=0.08
 $root/util/get-tarball "https://github.com/openresty/lua-resty-upstream-healthcheck/tarball/v$ver" -O "lua-resty-upstream-healthcheck-$ver.tar.gz" || exit 1
 tar -xzf lua-resty-upstream-healthcheck-$ver.tar.gz || exit 1
 mv openresty-lua-resty-upstream-healthcheck-* lua-resty-upstream-healthcheck-$ver || exit 1
--- a/util/ver
+++ b/util/ver
@ -1,7 +1,7 @@
 #!/bin/bash

 main_ver=1.21.4
-minor_ver=2
+minor_ver=2rc1
 version=$main_ver.$minor_ver
 echo $version
Author	SHA1	Message	Date
Yichun Zhang (agentzh)	dfbc003724	bugfix: dist-check: avoid killall nginx.	2023-04-17 10:24:06 -07:00
Johnny Wang	a1730aba13	upgraded luajit2 to 2.1-20230410. (#903 )	2023-04-14 17:02:57 +08:00
Yichun Zhang (agentzh)	055e86bff2	rc1 comes first.	2023-03-30 15:44:48 -07:00
Johnny Wang	f8e47102b7	bumped ngx_lua to 0.10.24, ngx_stream_lua to 0.0.13, lua-resty-core to 0.1.26. (#898 ) * bumped lua-resty-upstream-healthcheck version to 0.08. * tests: disable ipv6 for linux s390x. * bumped version to 1.21.4.2.	2023-03-23 18:23:03 +08:00
Yichun Zhang (agentzh)	0d32bd9bdb	win32: upgraded deps openssl, zlib, and pcre.	2023-03-08 15:23:08 -08:00
Johnny Wang	9fcf59d7b2	bumped ngx_lua version to 0.10.23. (#897 )	2023-03-08 15:10:14 +08:00
Johnny Wang	3c838ca999	upgraded ngx_lua to 0.10.23rc3. (#896 )	2023-03-07 16:23:52 +08:00
Johnny Wang	222b48ab61	bumped version to 1.21.4.2rc1. (#895 )	2023-03-07 12:25:28 +08:00
Yichun Zhang (agentzh)	3e4114a5f6	updated the default index page and 50x error page.	2023-03-04 13:39:35 -08:00
Johnny Wang	7a923b387d	upgraded ngx_lua to 0.10.23. (#890 ) * upgraded stream_ngx_lua to 0.0.12. * upgraded srcache-nginx-module to 0.33. * upgraded lua-resty-memcached to 0.17. * upgraded lua-resty-mysql to 0.26. * upgraded lua-resty-upload to 0.11. * upgraded lua-resty-websocket to 0.10. * upgraded lua-resty-core to 0.1.25.	2023-02-16 11:10:23 +08:00
Johnny Wang	d5c5ccbad2	upgraded ngx_lua to 0.10.23rc2. (#889 ) upgraded lua-resty-core to 0.1.25rc2.	2023-02-09 11:23:08 +08:00
Johnny Wang	21eb0377ac	travis: upgraded OpenSSL to 1.1.1s.	2023-01-19 22:01:10 +08:00