Skip to content

Commit b28a4df

Browse files
committed
cartridge: remove vendored cartridge-cli and all references
Remove cli/cartridge/ directory (vendored code + 9 patches), cartridge-cli from go.mod, cartridge backward-compat code from running/, dead test fixtures, and documentation sections. Closes TNTP-6979
1 parent 92f8c6b commit b28a4df

File tree

67 files changed

+46
-1196
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+46
-1196
lines changed

.gen_tarballs.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,7 @@ echo -n "* Create dependency tarball... "
8080
pushd ${TT_DIR} > /dev/null
8181
GOMODCACHE=${TMPDIR}/go-mod go mod download -modcacherw
8282
rc=$?
83-
pushd ${TT_DIR}/cli/cartridge/third_party/cartridge-cli > /dev/null
84-
GOMODCACHE=${TMPDIR}/go-mod go mod download -modcacherw
85-
let rc+=$?
8683

87-
popd > /dev/null
8884
popd > /dev/null
8985
tar --create --auto-compress --file tt-${TAG}-deps.tar.xz go-mod
9086
let rc+=$?

.gitmodules

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
url = https://github.com/tarantool/luarocks.git
44
branch = luarocks-3.9.2-tarantool
55
ignore = dirty
6-
[submodule "third_party/cartridge-cli"]
7-
path = cli/cartridge/third_party/cartridge-cli
8-
url = https://github.com/tarantool/cartridge-cli.git
9-
ignore = dirty
106
[submodule "cli/aeon/protos"]
117
path = cli/aeon/protos
128
url = https://github.com/tarantool/aeon-api-protos.git

cli/build/local_test.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,19 @@ func TestRunHooks(t *testing.T) {
1919

2020
require.NoError(t, runBuildHook(&buildCtx, PreBuildScripts))
2121
assert.FileExists(t, filepath.Join(workDir, "tt-pre-build-invoked"))
22-
assert.NoFileExists(t, filepath.Join(workDir, "cartridge-pre-build-invoked"))
2322

2423
require.NoError(t, runBuildHook(&buildCtx, PostBuildScripts))
2524
assert.FileExists(t, filepath.Join(workDir, "tt-post-build-invoked"))
26-
assert.NoFileExists(t, filepath.Join(workDir, "cartridge-post-build-invoked"))
2725

2826
assert.NoError(t, os.Remove(filepath.Join(workDir, "tt-pre-build-invoked")))
2927
assert.NoError(t, os.Remove(filepath.Join(workDir, "tt-post-build-invoked")))
3028
assert.NoError(t, os.Remove(filepath.Join(workDir, "tt.pre-build")))
3129
assert.NoError(t, os.Remove(filepath.Join(workDir, "tt.post-build")))
3230

3331
require.NoError(t, runBuildHook(&buildCtx, PreBuildScripts))
34-
assert.NoFileExists(t, filepath.Join(workDir, "cartridge-pre-build-invoked"))
3532
assert.NoFileExists(t, filepath.Join(workDir, "tt-pre-build-invoked"))
3633

3734
require.NoError(t, runBuildHook(&buildCtx, PostBuildScripts))
38-
assert.NoFileExists(t, filepath.Join(workDir, "cartridge-post-build-invoked"))
3935
assert.NoFileExists(t, filepath.Join(workDir, "tt-post-build-invoked"))
4036
}
4137

cli/build/testdata/runhooks/cartridge.post-build

Lines changed: 0 additions & 2 deletions
This file was deleted.

cli/build/testdata/runhooks/cartridge.pre-build

Lines changed: 0 additions & 2 deletions
This file was deleted.

cli/cartridge/extra/001_make_cmd_public.patch

Lines changed: 0 additions & 159 deletions
This file was deleted.

cli/cartridge/extra/002_fix_admin_param.patch

Lines changed: 0 additions & 12 deletions
This file was deleted.

cli/cartridge/extra/003_fix_work_paths.patch

Lines changed: 0 additions & 147 deletions
This file was deleted.

cli/cartridge/extra/004_fix_warning.patch

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)