Skip to content

Commit b2e9fc6

Browse files
themilchenkooleg-jukovec
authored andcommitted
Revert "rocks: bump luarocks"
This reverts commit b4b0bf3.
1 parent d116dfc commit b2e9fc6

File tree

4 files changed

+2
-4
lines changed

4 files changed

+2
-4
lines changed

CHANGELOG.md

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
3434
### Changed
3535

3636
- Do not create Dockerfile.* in application's directory.
37-
- Updated `luarocks` to `v3.10.0`.
3837

3938
## [2.3.1] - 2024-06-13
4039

cli/rocks/rocks.go

-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ func Exec(cmdCtx *cmdcontext.CmdCtx, cliOpts *config.CliOpts, args []string) err
177177
rocks_preload := map[string]string{
178178
"extra.wrapper": extra_path + "wrapper.lua",
179179
"luarocks.core.hardcoded": extra_path + "hardcoded.lua",
180-
"luarocks.vendor.dkjson": rocks_path + "luarocks/vendor/dkjson.lua",
181180
"luarocks.core.util": rocks_path + "luarocks/core/util.lua",
182181
"luarocks.core.persist": rocks_path + "luarocks/core/persist.lua",
183182
"luarocks.core.sysdetect": rocks_path + "luarocks/core/sysdetect.lua",

cli/rocks/third_party/luarocks

Submodule luarocks updated 110 files

test/integration/rocks/test_rocks.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ def test_rock_install_with_non_system_tarantool_in_path(tt_cmd, tmpdir_with_tara
277277
PATH=os.path.join(tmpdir_with_tarantool, 'bin') + ':' + os.environ['PATH']))
278278

279279
assert rc == 1 # Tarantool headers are not found.
280-
assert re.search("Could not find header file for TARANTOOL", output)
280+
assert re.search("Error: Failed finding Lua header files", output)
281281

282282
# Set env var to find tarantool headers.
283283
rocks_cmd = [tt_cmd, "rocks", "install", "crud", "1.1.1-1"]

0 commit comments

Comments
 (0)