chore(deps) bump OpenResty compat + Luarocks and Serf bump in Travis (K…

…ong#1883)

* chore(deps) add OpenResty 1.11.2.2 to supported versions

* chore(ci) bump Luarocks and Serf Travis-CI versions

* chore(deps) disable luajit-lua52 compat in OpenResty

.ci/setup_env.sh

@@ -52,15 +52,22 @@ if [ ! "$(ls -A $OPENSSL_INSTALL)" ]; then
 fi
 
 if [ ! "$(ls -A $OPENRESTY_INSTALL)" ]; then
+  OPENRESTY_OPTS=(
+    "--prefix=$OPENRESTY_INSTALL"
+    "--with-openssl=$OPENSSL_DOWNLOAD"
+    "--with-ipv6"
+    "--with-pcre-jit"
+    "--with-http_ssl_module"
+    "--with-http_realip_module"
+    "--with-http_stub_status_module"
+  )
+
+  if [ "$OPENRESTY" != "1.11.2.1" ]; then
+    OPENRESTY_OPTS[${#OPENRESTY_OPTS[@]}]="--without-luajit-lua52"
+  fi
+
   pushd $OPENRESTY_DOWNLOAD
-    ./configure \
-      --prefix=$OPENRESTY_INSTALL \
-      --with-openssl=$OPENSSL_DOWNLOAD \
-      --with-ipv6 \
-      --with-pcre-jit \
-      --with-http_ssl_module \
-      --with-http_realip_module \
-      --with-http_stub_status_module
+    ./configure ${OPENRESTY_OPTS[*]}
     make
     make install
   popd

.travis.yml

@@ -19,12 +19,12 @@ addons:
 
 env:
   global:
-    - SERF=0.7.0
-    - LUAROCKS=2.4.0
+    - SERF=0.8.0
+    - LUAROCKS=2.4.2
     - OPENSSL=1.0.2j
     - CASSANDRA=2.2.8
     - OPENRESTY_BASE=1.11.2.1
-    - OPENRESTY_LATEST=1.11.2.1
+    - OPENRESTY_LATEST=1.11.2.2
     - OPENRESTY=$OPENRESTY_BASE
     - DOWNLOAD_CACHE=$HOME/download-cache
     - INSTALL_CACHE=$HOME/install-cache

kong/meta.lua

@@ -18,7 +18,7 @@ return {
   -- third-party dependencies' required version, as they would be specified
   -- to lua-version's `set()` in the form {from, to}
   _DEPENDENCIES = {
-    nginx = {"1.11.2.1"},
+    nginx = {"1.11.2.1", "1.11.2.2"},
     serf = {"0.7.0", "0.8.0"},
     --resty = {}, -- not version dependent for now
   }

spec/01-unit/01-rockspec_meta_spec.lua

@@ -34,8 +34,8 @@ describe("rockspec/meta", function()
     end)
     it("has a _DEPENDENCIES field", function()
       assert.is_table(meta._DEPENDENCIES)
-      assert.equal(1, #meta._DEPENDENCIES.nginx)
-      assert.equal(2, #meta._DEPENDENCIES.serf)
+      assert.is_table(meta._DEPENDENCIES.nginx)
+      assert.is_table(meta._DEPENDENCIES.serf)
     end)
   end)