aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHisham Muhammad <hisham@gobolinux.org>2018-10-30 10:25:53 -0300
committerHisham Muhammad <hisham@gobolinux.org>2018-10-30 13:27:44 -0300
commit04bbe2e4fb29922d1afc20c9d95a6e45335e09f1 (patch)
tree1869c469b9558bf4f2aed896ce604d58dba83af1
parent50e4b793df2f22eca5d4c4244d5c89fcc4c34b70 (diff)
downloadluarocks-3.0.4.tar.gz
luarocks-3.0.4.tar.bz2
luarocks-3.0.4.zip
Release 3.0.4v3.0.4
-rw-r--r--.travis.yml6
-rw-r--r--appveyor.yml4
-rwxr-xr-xconfigure2
-rw-r--r--luarocks-3.0.4-1.rockspec (renamed from luarocks-dev-1.rockspec)5
-rw-r--r--src/luarocks/core/cfg.lua2
5 files changed, 10 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml
index 454de1ff..fea462a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,8 +14,8 @@ cache:
14 - testrun/binary-samples 14 - testrun/binary-samples
15 15
16smoke_script: &smoke_script 16smoke_script: &smoke_script
17 - ./makedist 3.0.0 17 - ./makedist 3.0.4
18 - ./smoke_test.sh luarocks-3.0.0.tar.gz 18 - ./smoke_test.sh luarocks-3.0.4.tar.gz
19 19
20unit_script: &unit_script 20unit_script: &unit_script
21 - busted -o gtest --exclude-tags=git,integration --verbose -Xhelper "lua_dir=$PWD/lua_install,travis" 21 - busted -o gtest --exclude-tags=git,integration --verbose -Xhelper "lua_dir=$PWD/lua_install,travis"
@@ -25,7 +25,7 @@ integration_script: &integration_script
25 - lua -v 25 - lua -v
26 - if [ "$TRAVIS_OS_NAME" = "linux" ]; then shellcheck ./configure; fi 26 - if [ "$TRAVIS_OS_NAME" = "linux" ]; then shellcheck ./configure; fi
27 - ./configure --with-lua=lua_install 27 - ./configure --with-lua=lua_install
28 - ./makedist 3.0.0 28 - ./makedist 3.0.4
29 - busted -o gtest --exclude-tags=git,unit --verbose -Xhelper "lua_dir=$PWD/lua_install,travis" 29 - busted -o gtest --exclude-tags=git,unit --verbose -Xhelper "lua_dir=$PWD/lua_install,travis"
30 - busted -o gtest --exclude-tags=git,unit --verbose -Xhelper "lua_dir=$PWD/lua_install,travis,env=full" 30 - busted -o gtest --exclude-tags=git,unit --verbose -Xhelper "lua_dir=$PWD/lua_install,travis,env=full"
31 31
diff --git a/appveyor.yml b/appveyor.yml
index 479c4960..9e51778e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
1version: 3.0.0.{build}-test 1version: 3.0.4.{build}-test
2 2
3shallow_clone: true 3shallow_clone: true
4 4
@@ -6,7 +6,7 @@ matrix:
6 fast_finish: true 6 fast_finish: true
7 7
8environment: 8environment:
9 LUAROCKS_VER: 3.0.0 9 LUAROCKS_VER: 3.0.4
10 10
11 matrix: 11 matrix:
12 # Lua 5.1 tests 12 # Lua 5.1 tests
diff --git a/configure b/configure
index e64eac28..2fd2666c 100755
--- a/configure
+++ b/configure
@@ -318,7 +318,7 @@ do
318done 318done
319 319
320echo 320echo
321BLUE "Configuring LuaRocks version dev..." 321BLUE "Configuring LuaRocks version 3.0.4..."
322echo 322echo
323echo 323echo
324 324
diff --git a/luarocks-dev-1.rockspec b/luarocks-3.0.4-1.rockspec
index bc19e3ff..12593405 100644
--- a/luarocks-dev-1.rockspec
+++ b/luarocks-3.0.4-1.rockspec
@@ -1,8 +1,9 @@
1rockspec_format = "3.0" 1rockspec_format = "3.0"
2package = "luarocks" 2package = "luarocks"
3version = "dev-1" 3version = "3.0.4-1"
4source = { 4source = {
5 url = "git+https://github.com/luarocks/luarocks" 5 url = "git+https://github.com/luarocks/luarocks",
6 tag = "v3.0.4",
6} 7}
7description = { 8description = {
8 summary = "A package manager for Lua modules.", 9 summary = "A package manager for Lua modules.",
diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua
index bbcc72ac..3237786c 100644
--- a/src/luarocks/core/cfg.lua
+++ b/src/luarocks/core/cfg.lua
@@ -19,7 +19,7 @@ local sysdetect = require("luarocks.core.sysdetect")
19 19
20-------------------------------------------------------------------------------- 20--------------------------------------------------------------------------------
21 21
22local program_version = "dev" 22local program_version = "3.0.4"
23local program_series = "3.0" 23local program_series = "3.0"
24local major_version = (program_version:match("([^.]%.[^.])")) or program_series 24local major_version = (program_version:match("([^.]%.[^.])")) or program_series
25 25