]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
scripts, docs: specify lua version in `luarocks install`
authorVladimír Čunát <vladimir.cunat@nic.cz>
Mon, 31 Aug 2020 07:29:44 +0000 (09:29 +0200)
committerPetr Špaček <petr.spacek@nic.cz>
Mon, 7 Sep 2020 14:41:03 +0000 (16:41 +0200)
On some systems luarocks defaults to other lua version (e.g. Fedora),
so the result would not be usable from kresd.  I didn't touch scripts
for older distro versions (Debian < 10, Ubuntu < 20.04, CentOS 7).

ci/debian-buster/Dockerfile
modules/etcd/.packaging/debian/10/pre-test.sh
modules/etcd/.packaging/leap/15.2/pre-test.sh
modules/etcd/.packaging/ubuntu/20.04/pre-test.sh
modules/etcd/README.rst
modules/experimental_dot_auth/.packaging/leap/15.2/pre-test.sh
modules/graphite/.packaging/leap/15.2/pre-test.sh
modules/http/.packaging/leap/15.2/pre-test.sh
modules/http/README.rst

index 1656ac56f871647bfdf794c211bc68300d04f961..0d0527f8ad60a9a4f91c749975d3d550e810ae6f 100644 (file)
@@ -58,7 +58,7 @@ RUN wget https://github.com/LuaJIT/LuaJIT/raw/v2.1.0-beta3/src/lj.supp -O /lj.su
 
 # Lua lint for kresd CI
 RUN apt-get install luarocks -y -qqq
-RUN luarocks install luacheck
+RUN luarocks --lua-version 5.1 install luacheck
 
 # respdiff for kresd CI
 RUN apt-get install lmdb-utils -y -qqq
@@ -89,7 +89,7 @@ RUN apt-get install pdns-recursor -y -qqq
 
 # code coverage
 RUN apt-get install -y -qqq lcov
-RUN luarocks install luacov
+RUN luarocks --lua-version 5.1 install luacov
 
 # LuaJIT binary for stand-alone scripting
 RUN apt-get install -y -qqq luajit
index 4df79d999fe9d68d6a61fb24937a164610cf5d91..20073dc8e67cf64dba5814b4dc6510becfbfcc56 100755 (executable)
@@ -1 +1 @@
-luarocks install etcd --from=https://mah0x211.github.io/rocks/
+luarocks --lua-version 5.1 install etcd --from=https://mah0x211.github.io/rocks/
index 4df79d999fe9d68d6a61fb24937a164610cf5d91..20073dc8e67cf64dba5814b4dc6510becfbfcc56 100755 (executable)
@@ -1 +1 @@
-luarocks install etcd --from=https://mah0x211.github.io/rocks/
+luarocks --lua-version 5.1 install etcd --from=https://mah0x211.github.io/rocks/
index 4df79d999fe9d68d6a61fb24937a164610cf5d91..20073dc8e67cf64dba5814b4dc6510becfbfcc56 100755 (executable)
@@ -1 +1 @@
-luarocks install etcd --from=https://mah0x211.github.io/rocks/
+luarocks --lua-version 5.1 install etcd --from=https://mah0x211.github.io/rocks/
index 6e662fa9572b552c80e3262949f7bf1a2f2121bc..567151d4c3dbb44423be5eaabbd9ee940cab4b97 100644 (file)
@@ -42,5 +42,5 @@ Dependencies
 
 * `lua-etcd <https://github.com/mah0x211/lua-etcd>`_ library available in LuaRocks
 
-    ``$ luarocks install etcd --from=https://mah0x211.github.io/rocks/``
+    ``$ luarocks --lua-version 5.1 install etcd --from=https://mah0x211.github.io/rocks/``
 
index 3c9f932564e632da1919fb4855efbe777be0c9fe..df5d7845ac3c760dedca51abcc24cb37dbd60f1b 100755 (executable)
@@ -1 +1 @@
-luarocks install basexx --from=https://mah0x211.github.io/rocks/
+luarocks --lua-version 5.1 install basexx --from=https://mah0x211.github.io/rocks/
index 725e5fce86ebfc0423f83a9bfadf4d4cce3379e4..9614066a3f09cc8368f3974efe1b2b5dbc4c9371 100755 (executable)
@@ -1 +1 @@
-luarocks install cqueues --from=https://mah0x211.github.io/rocks/
+luarocks --lua-version 5.1 install cqueues --from=https://mah0x211.github.io/rocks/
index 6b98d7ee2f2a8d58dc4079d665b41f55eb5a85b2..bb1e1311f1b700fe0f5040574a2b1a8fe4a2a4a4 100755 (executable)
@@ -1 +1 @@
-luarocks install http --from=https://mah0x211.github.io/rocks/
+luarocks --lua-version 5.1 install http --from=https://mah0x211.github.io/rocks/
index ef74d1158a793d8b4b7a5aec65abc34d4f06fb60..05ad0f3c82541f1b203904e1ea4397563a4ac2b9 100644 (file)
@@ -152,17 +152,17 @@ Dependencies
        $ brew install openssl
        $ brew link openssl --force # Override system OpenSSL
 
-    Any other system can install from LuaRocks directly:
+    Some other systems can install from LuaRocks directly:
 
     .. code-block:: bash
 
-       $ luarocks install http
+       $ luarocks --lua-version 5.1 install http
 
 * (*optional*) `mmdblua <https://github.com/daurnimator/mmdblua>`_ available in LuaRocks
 
     .. code-block:: bash
 
-       $ luarocks install --server=https://luarocks.org/dev mmdblua
+       $ luarocks --lua-version 5.1 install --server=https://luarocks.org/dev mmdblua
        $ curl -O https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz
        $ gzip -d GeoLite2-City.mmdb.gz