Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

app-dependency: update Cartridge to 2.12.2 #798

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

app-dependency: update Cartridge to 2.12.2 #798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## Unreleased

### Changed
- Update `cartridge` to `2.12.2` and `metrics` to `1.2.0` in application template.

## [2.12.12] - 2024-05-07

### Fixed
Expand All @@ -15,7 +20,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

### Changed

- Updated the `go` and `docker` package versions used to build the binary,
- Updated the `go` and `docker` package versions used to build the binary,
that fixes known security issues.

## [2.12.10] - 2023-12-14
Expand Down
4 changes: 2 additions & 2 deletions cli/create/templates/cartridge/{{ .NameToLower }}-scm-1.rockspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ dependencies = {
'tarantool',
'lua >= 5.1',
'checks == 3.3.0-1',
'cartridge == 2.8.4-1',
'metrics == 1.0.0-1',
'cartridge == 2.12.2-1',
'metrics == 1.2.0-1',
'cartridge-metrics-role == 0.1.1-1',
'cartridge-cli-extensions == 1.1.1-1',
}
Expand Down
4 changes: 2 additions & 2 deletions examples/getting-started-app/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,9 +661,9 @@ dependencies = {
'tarantool',
'lua >= 5.1',
'checks == 3.3.0-1',
'cartridge == 2.8.4-1',
'cartridge == 2.12.2-1',
'ldecnumber == 1.1.3-1',
'metrics == 1.0.0-1',
'metrics == 1.2.0-1',
'cartridge-metrics-role == 0.1.1-1',
}
build = {
Expand Down
4 changes: 2 additions & 2 deletions examples/getting-started-app/README_RUS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,9 +655,9 @@ dependencies = {
'tarantool',
'lua >= 5.1',
'checks == 3.3.0-1',
'cartridge == 2.8.4-1',
'cartridge == 2.12.2-1',
'ldecnumber == 1.1.3-1',
'metrics == 1.0.0-1',
'metrics == 1.2.0-1',
'cartridge-metrics-role == 0.1.1-1',
}
build = {
Expand Down
4 changes: 2 additions & 2 deletions examples/getting-started-app/getting-started-app-scm-1.rockspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ dependencies = {
'tarantool',
'lua >= 5.1',
'checks == 3.3.0-1',
'cartridge == 2.8.4-1',
'cartridge == 2.12.2-1',
'ldecnumber == 1.1.3-1',
'metrics == 1.0.0-1',
'metrics == 1.2.0-1',
'cartridge-metrics-role == 0.1.1-1',
}
build = {
Expand Down
2 changes: 1 addition & 1 deletion test/integration/cli/test_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,5 +144,5 @@ def test_duplicate_cartridge_no_rocks_flag(project_with_cartridge, cartridge_cmd

rc, output = run_command_and_get_output(cmd)
assert rc == 0
assert "Version:\t2.5.0-1, 2.8.4-1" in output
assert "Version:\t2.12.2-1, 2.5.0-1" in output
assert "Found multiple versions of Cartridge in rocks manifest" in output
4 changes: 2 additions & 2 deletions test/integration/create/test_create.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ def app_template(tmpdir):
'tarantool',
'lua >= 5.1',
'checks == 3.3.0-1',
'cartridge == 2.8.4-1',
'metrics == 1.0.0-1',
'cartridge == 2.12.2-1',
'metrics == 1.2.0-1',
'cartridge-metrics-role == 0.1.1-1',
}
build = {
Expand Down
Loading