Skip to content

Commit

Permalink
Replace mdb-ch-tools with ch-tools
Browse files Browse the repository at this point in the history
  • Loading branch information
dstaroff committed Jul 14, 2023
1 parent 305ce93 commit 34be8c0
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 14 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ jobs:
# language=sh
run: |
sudo make uninstall
sudo apt-get install -q -y ./out/mdb-ch-tools*.deb
sudo apt-get install -q -y ./out/ch-tools*.deb
sudo chadmin --help
sudo ch-monitoring --no-user-check --help
sudo keeper-monitoring --help
Expand All @@ -137,6 +137,6 @@ jobs:
uses: actions/upload-artifact@v3
if: ${{ matrix.clickhouse == 'latest' }}
with:
name: mdb-ch-tools_py-${{ matrix.target.python }}_ubuntu-${{ matrix.target.ubuntu }}.deb
path: out/mdb-ch-tools*.deb
name: ch-tools_py-${{ matrix.target.python }}_ubuntu-${{ matrix.target.ubuntu }}.deb
path: out/ch-tools*.deb
if-no-files-found: error
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/make -f

PREFIX=/opt/yandex/mdb-ch-tools
PREFIX=/opt/yandex/ch-tools
INSTALL_DIR=$(DESTDIR)$(PREFIX)

.PHONY: install
Expand All @@ -11,7 +11,7 @@ uninstall: uninstall-python-package uninstall-symlinks uninstall-bash-completion

.PHONY: install-python-package
install-python-package: build-python-package
@echo 'Installing mdb-ch-tools'
@echo 'Installing ch-tools'

python3 -m venv $(INSTALL_DIR)
rm -f $(INSTALL_DIR)/bin/activate*
Expand Down Expand Up @@ -47,7 +47,7 @@ venv/bin/python3:

.PHONY: uninstall-python-package
uninstall-python-package:
@echo 'Uninstalling mdb-ch-tools'
@echo 'Uninstalling ch-tools'
rm -rf $(INSTALL_DIR)

.PHONY: install-symlinks
Expand Down Expand Up @@ -120,30 +120,30 @@ version.txt:
.PHONY: build-deb-package
build-deb-package: prepare-changelog
cd debian && debuild --check-dirname-level 0 --preserve-env --no-lintian --no-tgz-check -uc -us
mkdir out && mv ../mdb-ch-tools* out/
mkdir out && mv ../ch-tools*.deb out/

.PHONY: clean
clean:
@echo 'Cleaning up'

rm -rf build
rm -rf debian/files debian/.debhelper
rm -rf debian/mdb-ch-tools*
rm -rf debian/ch-tools*

.PHONY: help
help:
@echo "Base targets:"
@echo " prepare-changelog Add an autobuild version entity to changelog"
@echo " prepare-version Update version based on latest commit"
@echo " build-python-package Build 'ch-tools' Python package"
@echo " build-deb-package Build 'mdb-ch-tools' debian package"
@echo " build-deb-package Build 'ch-tools' debian package"
@echo " clean Clean up after building debian package"
@echo ""
@echo "--------------------------------------------------------------------------------"
@echo ""
@echo "Debian package build targets:"
@echo " install Install 'mdb-ch-tools' debian package"
@echo " uninstall Uninstall 'mdb-ch-tools' debian package"
@echo " install Install 'ch-tools' debian package"
@echo " uninstall Uninstall 'ch-tools' debian package"
@echo ""
@echo " install-python-package Install 'ch-tools' python package"
@echo " uninstall-python-package Uninstall 'ch-tools' python package"
Expand Down
2 changes: 1 addition & 1 deletion debian/changelog
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mdb-ch-tools (1.0.0) UNRELEASED; urgency=low
ch-tools (1.0.0) UNRELEASED; urgency=low

* Initial Release.

Expand Down
5 changes: 3 additions & 2 deletions debian/control
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: mdb-ch-tools
Source: ch-tools
Section: database
Priority: optional
Maintainer: Yandex LLC
Expand All @@ -18,6 +18,7 @@ Vcs-Browser: https://github.com/yandex/ch-tools.git
Vcs-Git: git://github.com:yandex/ch-tools.git
X-Python3-Version: >= 3.6

Package: mdb-ch-tools
Package: ch-tools
Architecture: any
Description: A set of tools for administration and diagnostics of ClickHouse DBMS.
Replaces: mdb-ch-tools

0 comments on commit 34be8c0

Please sign in to comment.