Merge pull request #2539 from xrmx/fix-2532

plugins/{rack,ruby}: handle recent ruby versions

.github/workflows/compile-test.yml

@@ -9,16 +9,21 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
+    - name: remove sury php ppa that does not ship libphpX.Y-embed
+      run: |
+        sudo add-apt-repository --remove ppa:ondrej/php
+        sudo apt remove php7.4-dev php7.4 php7.4-common
     - name: Install dependencies
       run: |
         sudo apt update -qq
-        sudo apt install --no-install-recommends -qqyf python3.6-dev \
+        sudo apt install --no-install-recommends -qqyf python3.8-dev \
           libxml2-dev libpcre3-dev libcap2-dev \
-          php7.2-dev libphp7.2-embed libargon2-0-dev libsodium-dev \
-          liblua5.1-0-dev ruby2.5-dev \
+          libargon2-0-dev libsodium-dev \
+          php7.4-dev libphp7.4-embed \
+          liblua5.1-0-dev ruby2.7-dev \
           libjansson-dev libldap2-dev libpq-dev \
           libpam0g-dev libsqlite3-dev libyaml-dev \
           libzmq3-dev libmatheval-dev libperl-dev \
@@ -27,12 +32,12 @@ jobs:
           libboost-thread-dev libboost-filesystem-dev \
           libssl-dev libacl1-dev python-greenlet-dev \
           libcurl4-openssl-dev \
-          openjdk-8-jdk libgloox-dev gccgo \
+          openjdk-11-jdk libgloox-dev gccgo \
           cli-common-dev mono-devel mono-mcs uuid-dev \
           curl check
     - uses: actions/checkout@v2
     - name: Build kitchensink uWSGI binary
-      run: UWSGICONFIG_PHPPATH=php-config7.2 /usr/bin/python3 uwsgiconfig.py --build travis
+      run: UWSGICONFIG_PHPPATH=php-config7.4 /usr/bin/python3 uwsgiconfig.py --build travis
     - name: Build uWSGI binary
       run: |
         /usr/bin/python3 uwsgiconfig.py --build base

.github/workflows/test.yml

@@ -9,24 +9,22 @@ on:
 jobs:
   python:
 
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
         python-version: ["2.7", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
         test-suite: [unittest, python, deadlocks]
     steps:
     - name: Add deadnakes ppa
-      run: |
-        sudo apt install -qqyf software-properties-common
-        sudo add-apt-repository ppa:deadsnakes/ppa -y
+      run: sudo add-apt-repository ppa:deadsnakes/ppa -y
     - name: Install dependencies
       run: |
         sudo apt update -qq
         sudo apt install --no-install-recommends -qqyf python${{ matrix.python-version }}-dev \
           libpcre3-dev libjansson-dev libcap2-dev \
           curl check
     - name: Install distutils
-      if: contains(fromJson('["3.8","3.9","3.10","3.11"]'), matrix.python-version)
+      if: contains(fromJson('["3.6","3.7","3.8","3.9","3.10","3.11"]'), matrix.python-version)
       run: |
         sudo apt install --no-install-recommends -qqyf python${{ matrix.python-version }}-distutils \
     - uses: actions/checkout@v2
@@ -52,20 +50,16 @@ jobs:
 
   rack:
 
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
-        rack-version: ["251"]
+        rack-version: ["270"]
     steps:
-    - name: Add deadnakes ppa
-      run: |
-        sudo apt install -qqyf software-properties-common
-        sudo add-apt-repository ppa:deadsnakes/ppa -y
     - name: Install dependencies
       run: |
         sudo apt update -qq
         sudo apt install --no-install-recommends -qqyf python3-dev \
-          libpcre3-dev libjansson-dev libcap2-dev \
+          libpcre3-dev libjansson-dev libcap2-dev ruby2.7-dev \
           curl check
     - uses: actions/checkout@v2
     - name: Run unit tests

buildconf/travis.ini

@@ -1,3 +1,3 @@
 [uwsgi]
-main_plugin = psgi,rack,lua,python,gevent,php,cgi,pty,xslt,msgpack,geoip,v8,pam,ldap,mono,jvm,ring,jwsgi,servlet,pypy,airbrake,alarm_curl,alarm_xmpp,asyncio,cheaper_backlog2,clock_monotonic,clock_realtime,cplusplus,curl_cron,dumbloop,dummy,echo,emperor_amqp,emperor_pg,emperor_zeromq,example,exception_log,fiber,forkptyrouter,graylog2,legion_cache_fetch,libffi,logcrypto,logpipe,logzmq,matheval,notfound,rbthreads,router_access,router_radius,router_spnego,router_xmldir,sqlite3,ssi,stats_pusher_file,stats_pusher_statsd,tornado,transformation_toupper,tuntap,webdav,xattr,zabbix
+main_plugin = psgi,rack,lua,python,gevent,php,cgi,pty,xslt,msgpack,geoip,pam,ldap,mono,jvm,ring,jwsgi,servlet,pypy,airbrake,alarm_curl,asyncio,cheaper_backlog2,clock_monotonic,clock_realtime,cplusplus,curl_cron,dumbloop,dummy,echo,emperor_amqp,emperor_pg,emperor_zeromq,example,exception_log,fiber,forkptyrouter,graylog2,legion_cache_fetch,libffi,logcrypto,logpipe,logzmq,matheval,notfound,rbthreads,router_access,router_radius,router_spnego,router_xmldir,sqlite3,ssi,stats_pusher_file,stats_pusher_statsd,tornado,transformation_toupper,tuntap,webdav,xattr,zabbix
 inherit = base

plugins/jvm/uwsgiplugin.py

@@ -32,11 +32,14 @@
     JVM_INCPATH = ['-I"/cygdrive/c/Program Files/Java/jdk1.7.0_17/include"', '-I"/cygdrive/c/Program Files/Java/jdk1.7.0_17/include/win32"']
     JVM_LIBPATH = ['-L"/cygdrive/c/Program Files/Java/jdk1.7.0_17/jre/bin/server"']
 else:
-    known_jvms = ('/usr/lib/jvm/java-7-openjdk', '/usr/local/openjdk7', '/usr/lib/jvm/java-6-openjdk', '/usr/local/openjdk', '/usr/java', '/usr/lib/jvm/java/', '/usr/lib/jvm/java-8-openjdk-%s' % arch)
+    known_jvms = ('/usr/lib/jvm/java-7-openjdk', '/usr/local/openjdk7', '/usr/lib/jvm/java-6-openjdk', '/usr/local/openjdk', '/usr/java', '/usr/lib/jvm/java/', '/usr/lib/jvm/java-8-openjdk-%s' % arch, '/usr/lib/jvm/java-11-openjdk-%s' % arch)
     for jvm in known_jvms:
         if os.path.exists(jvm + '/include'):
             JVM_INCPATH = ["-I%s/include/" % jvm, "-I%s/include/%s" % (jvm, operating_system)]
-            JVM_LIBPATH = ["-L%s/jre/lib/%s/server" % (jvm, arch)]
+            if os.path.exists("%s/jre"):
+                JVM_LIBPATH = ["-L%s/jre/lib/%s/server" % (jvm, arch)]
+            else:
+                JVM_LIBPATH = ["-L%s/lib/server" % (jvm,)]
             break
         if os.path.exists("%s-%s/include" % (jvm, arch)):
             jvm = "%s-%s" % (jvm, arch)