aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml6
-rw-r--r--appveyor.yml4
-rwxr-xr-xconfigure2
-rw-r--r--luarocks-3.0.3-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 5d24b4d2..c13e29aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,8 +13,8 @@ cache:
13 - testrun/testing_server-2.1 13 - testrun/testing_server-2.1
14 14
15smoke_script: &smoke_script 15smoke_script: &smoke_script
16 - ./makedist 3.0.0 16 - ./makedist 3.0.3
17 - ./smoke_test.sh luarocks-3.0.0.tar.gz 17 - ./smoke_test.sh luarocks-3.0.3.tar.gz
18 18
19unit_script: &unit_script 19unit_script: &unit_script
20 - busted -o gtest --exclude-tags=git,integration --verbose -Xhelper "lua_dir=$PWD/lua_install,travis" 20 - busted -o gtest --exclude-tags=git,integration --verbose -Xhelper "lua_dir=$PWD/lua_install,travis"
@@ -24,7 +24,7 @@ integration_script: &integration_script
24 - lua -v 24 - lua -v
25 - if [ "$TRAVIS_OS_NAME" = "linux" ]; then shellcheck ./configure; fi 25 - if [ "$TRAVIS_OS_NAME" = "linux" ]; then shellcheck ./configure; fi
26 - ./configure --with-lua=lua_install 26 - ./configure --with-lua=lua_install
27 - ./makedist 3.0.0 27 - ./makedist 3.0.3
28 - busted -o gtest --exclude-tags=git,unit --verbose -Xhelper "lua_dir=$PWD/lua_install,travis" 28 - 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,env=full" 29 - busted -o gtest --exclude-tags=git,unit --verbose -Xhelper "lua_dir=$PWD/lua_install,travis,env=full"
30 30
diff --git a/appveyor.yml b/appveyor.yml
index 479c4960..e2b9046b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
1version: 3.0.0.{build}-test 1version: 3.0.3.{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.3
10 10
11 matrix: 11 matrix:
12 # Lua 5.1 tests 12 # Lua 5.1 tests
diff --git a/configure b/configure
index e64eac28..8c77c644 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.3..."
322echo 322echo
323echo 323echo
324 324
diff --git a/luarocks-dev-1.rockspec b/luarocks-3.0.3-1.rockspec
index bc19e3ff..909d062b 100644
--- a/luarocks-dev-1.rockspec
+++ b/luarocks-3.0.3-1.rockspec
@@ -1,8 +1,9 @@
1rockspec_format = "3.0" 1rockspec_format = "3.0"
2package = "luarocks" 2package = "luarocks"
3version = "dev-1" 3version = "3.0.3-1"
4source = { 4source = {
5 url = "git+https://github.com/luarocks/luarocks" 5 url = "git+https://github.com/luarocks/luarocks",
6 tag = "v3.0.3",
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 9be573ce..e49e89b8 100644
--- a/src/luarocks/core/cfg.lua
+++ b/src/luarocks/core/cfg.lua
@@ -18,7 +18,7 @@ local persist = require("luarocks.core.persist")
18 18
19-------------------------------------------------------------------------------- 19--------------------------------------------------------------------------------
20 20
21local program_version = "dev" 21local program_version = "3.0.3"
22local program_series = "3.0" 22local program_series = "3.0"
23local major_version = (program_version:match("([^.]%.[^.])")) or program_series 23local major_version = (program_version:match("([^.]%.[^.])")) or program_series
24 24