Skip to content

Commit

Permalink
rocks: revert luarocks to 3.9.2
Browse files Browse the repository at this point in the history
It also bumps a commit on the branch and fixes an loading of local
configs.

Fixes #1003
  • Loading branch information
oleg-jukovec committed Nov 13, 2024
1 parent 5347a00 commit f87a566
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

### Fixed

- `tt rocks`: don't load local configs.

## [2.5.2] - 2024-11-07

Update luarocks and libraries version.
Expand Down
1 change: 0 additions & 1 deletion cli/rocks/rocks.go
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ func Exec(cmdCtx *cmdcontext.CmdCtx, cliOpts *config.CliOpts, args []string) err
rocks_preload := map[string]string{
"extra.wrapper": extra_path + "wrapper.lua",
"luarocks.core.hardcoded": extra_path + "hardcoded.lua",
"luarocks.vendor.dkjson": rocks_path + "luarocks/vendor/dkjson.lua",
"luarocks.core.util": rocks_path + "luarocks/core/util.lua",
"luarocks.core.persist": rocks_path + "luarocks/core/persist.lua",
"luarocks.core.sysdetect": rocks_path + "luarocks/core/sysdetect.lua",
Expand Down
2 changes: 1 addition & 1 deletion cli/rocks/third_party/luarocks
Submodule luarocks updated 110 files
2 changes: 1 addition & 1 deletion test/integration/rocks/test_rocks.py
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ def test_rock_install_with_non_system_tarantool_in_path(tt_cmd, tmpdir_with_tara
PATH=os.path.join(tmpdir_with_tarantool, 'bin') + ':' + os.environ['PATH']))

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

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

0 comments on commit f87a566

Please sign in to comment.