Merge branch '3.13.0'

5 files changed, 6 insertions, 7 deletions

diff --git a/configure b/configure
index 4c294105..170f4ede 100755
--- a/configure
+++ b/configure
@@ -321,7 +321,7 @@ do
 done
 
 echo
-BLUE "Configuring LuaRocks version 3.12.2..."
+BLUE "Configuring LuaRocks version 3.13.0..."
 echo
 echo
 
diff --git a/install.bat b/install.bat
index 25fc697e..31c78288 100644
--- a/install.bat
+++ b/install.bat
@@ -6,7 +6,7 @@ local vars = {}
 

 

 vars.PREFIX = nil

-vars.VERSION = "3.12"

+vars.VERSION = "3.13"

 vars.SYSCONFDIR = nil

 vars.CONFBACKUPDIR = nil

 vars.SYSCONFFILENAME = nil

diff --git a/luarocks-3.12.2-1.rockspec b/luarocks-dev-1.rockspec
index 728854cb..693c41d1 100644
--- a/luarocks-3.12.2-1.rockspec
+++ b/luarocks-dev-1.rockspec
@@ -1,9 +1,8 @@
 rockspec_format = "3.0"
 package = "luarocks"
-version = "3.12.2-1"
+version = "3.13.0-1"
 source = {
    url = "git+https://github.com/luarocks/luarocks",
-   tag = "v3.12.2",
 }
 description = {
    summary = "A package manager for Lua modules.",
diff --git a/mergerelease b/mergerelease
index e7c9c768..fe235cc2 100755
--- a/mergerelease
+++ b/mergerelease
@@ -25,8 +25,8 @@ git show origin v$v &> /dev/null || {
 }
 
 git fetch --all
-git checkout master
-git diff master $v > version.diff
+git checkout main
+git diff main $v > version.diff
 git merge --no-ff $v
 patch -R -p1 < version.diff
 git add luarocks-dev-1.rockspec
diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua
index 7e1294cd..1c380e1d 100644
--- a/src/luarocks/core/cfg.lua
+++ b/src/luarocks/core/cfg.lua
@@ -21,7 +21,7 @@ local vers = require("luarocks.core.vers")
 
 --------------------------------------------------------------------------------
 
-local program_version = "3.12.2"
+local program_version = "3.13.0"
 
 local is_windows = package.config:sub(1,1) == "\\"