Skip to content

Commit

Permalink
app-dependency: update cartridge to 2.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
yngvar-antonsson committed Jul 24, 2023
1 parent c5919dc commit c753c83
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 17 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

- Remove decorations (dots at the beginning of each line) from output to stdout in admin commands.

- Update `checks` to `3.3.0`, `cartridge` to `2.8.1`, `metrics` to `1.0.0` and
`cartridge-metrics-role` to `0.1.1` in application template.

## [2.12.6] - 2023-07-12

### Fixed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ source = {
dependencies = {
'tarantool',
'lua >= 5.1',
'checks == 3.2.0-1',
'cartridge == 2.7.9-1',
'metrics == 0.16.0-1',
'checks == 3.3.0-1',
'cartridge == 2.8.0-1',
'metrics == 1.0.0-1',
'cartridge-metrics-role == 0.1.0-1',
'cartridge-cli-extensions == 1.1.1-1',
}
build = {
Expand Down
7 changes: 4 additions & 3 deletions examples/getting-started-app/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -660,10 +660,11 @@ source = {
dependencies = {
'tarantool',
'lua >= 5.1',
'checks == 3.2.0-1',
'cartridge == 2.7.9-1',
'checks == 3.3.0-1',
'cartridge == 2.8.1-1',
'ldecnumber == 1.1.3-1',
'metrics == 0.16.0-1',
'metrics == 1.0.0-1',
'cartridge-metrics-role == 0.1.1-1',
}
build = {
type = 'none';
Expand Down
7 changes: 4 additions & 3 deletions examples/getting-started-app/README_RUS.md
Original file line number Diff line number Diff line change
Expand Up @@ -654,10 +654,11 @@ source = {
dependencies = {
'tarantool',
'lua >= 5.1',
'checks == 3.2.0-1',
'cartridge == 2.7.9-1',
'checks == 3.3.0-1',
'cartridge == 2.8.1-1',
'ldecnumber == 1.1.3-1',
'metrics == 0.16.0-1',
'metrics == 1.0.0-1',
'cartridge-metrics-role == 0.1.1-1',
}
build = {
type = 'none';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ source = {
dependencies = {
'tarantool',
'lua >= 5.1',
'checks == 3.2.0-1',
'cartridge == 2.7.9-1',
'checks == 3.3.0-1',
'cartridge == 2.8.1-1',
'ldecnumber == 1.1.3-1',
'metrics == 0.16.0-1',
'metrics == 1.0.0-1',
'cartridge-metrics-role == 0.1.1-1',
}
build = {
type = 'none';
Expand Down
4 changes: 2 additions & 2 deletions test/integration/cli/test_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def test_duplicate_rocks(project_with_cartridge, cartridge_cmd, version_cmd):

rc, output = run_command_and_get_output(cmd)
assert rc == 0
assert "graphql 0.1.0-1, 0.2.0-1" in output
assert "graphql 0.1.0-1, 0.3.0-1" in output
assert "Found multiple versions in rocks manifest" in output


Expand All @@ -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.7.9-1" in output
assert "Version:\t2.5.0-1, 2.8.1-1" in output
assert "Found multiple versions of Cartridge in rocks manifest" in output
7 changes: 4 additions & 3 deletions test/integration/create/test_create.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,10 @@ def app_template(tmpdir):
dependencies = {
'tarantool',
'lua >= 5.1',
'checks == 3.2.0-1',
'cartridge == 2.7.9-1',
'metrics == 0.16.0-1',
'checks == 3.3.0-1',
'cartridge == 2.8.1-1',
'metrics == 1.0.0-1',
'cartridge-metrics-role == 0.1.1-1',
}
build = {
type = 'none';
Expand Down

0 comments on commit c753c83

Please sign in to comment.