From 24549aeb0d9a9d43108b92e7a00a11ec5f6350ac Mon Sep 17 00:00:00 2001 From: MagomeYae <91249055+MagomeYae@users.noreply.github.com> Date: Mon, 6 Dec 2021 00:03:41 +0800 Subject: fix(pkg): Fix service name not correctly * fix(ci): Fix build fail target not trigger correctly Signed-off-by: MagomeYae <91249055+MagomeYae@users.noreply.github.com> --- .gitlab-ci.yml | 4 +++- repo/ksutils-probe-client/PKGBUILD | 4 ++-- repo/ksutils-probe-client/ksutils-probe-client@.service | 16 ++++++++++++++++ repo/ksutils-probe-client/probe-client@.service | 16 ---------------- 4 files changed, 21 insertions(+), 19 deletions(-) create mode 100644 repo/ksutils-probe-client/ksutils-probe-client@.service delete mode 100644 repo/ksutils-probe-client/probe-client@.service diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b15262c..48e23b6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,9 @@ build: GIT_SUBMODULE_STRATEGY: recursive artifacts: - untracked: true + paths: + - packages/ + - .fail expire_in: 4 hours only: changes: diff --git a/repo/ksutils-probe-client/PKGBUILD b/repo/ksutils-probe-client/PKGBUILD index 756ccbb..ff5c86d 100644 --- a/repo/ksutils-probe-client/PKGBUILD +++ b/repo/ksutils-probe-client/PKGBUILD @@ -3,13 +3,13 @@ _basename=probe-client pkgname=ksutils-$_basename pkgver=2.4.0 -pkgrel=2 +pkgrel=3 pkgdesc='A probe client, for distributed systems' arch=('any') url=https://github.com/KunoiSayami/probe-client source=( git://github.com/KunoiSayami/probe-client#tag=2.4.0 - $pkgname@.service) + "$pkgname@.service") license=('AGPL3') sha512sums=( 'SKIP' diff --git a/repo/ksutils-probe-client/ksutils-probe-client@.service b/repo/ksutils-probe-client/ksutils-probe-client@.service new file mode 100644 index 0000000..7b31983 --- /dev/null +++ b/repo/ksutils-probe-client/ksutils-probe-client@.service @@ -0,0 +1,16 @@ +[Unit] +Description=KunoiSayami utils Probe client service +After=network-online.target + +[Service] +Type=simple +Restart=always +RestartSec=10s +Environment="RUST_LOG=info" +WorkingDirectory=/usr/bin/ksutils-probe-client -c %i.toml +ExecStart=/etc/ksutils/probe-client/ +KillSignal=SIGINT +TimeoutStopSec=10 + +[Install] +WantedBy=multi-user.target diff --git a/repo/ksutils-probe-client/probe-client@.service b/repo/ksutils-probe-client/probe-client@.service deleted file mode 100644 index 7b31983..0000000 --- a/repo/ksutils-probe-client/probe-client@.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=KunoiSayami utils Probe client service -After=network-online.target - -[Service] -Type=simple -Restart=always -RestartSec=10s -Environment="RUST_LOG=info" -WorkingDirectory=/usr/bin/ksutils-probe-client -c %i.toml -ExecStart=/etc/ksutils/probe-client/ -KillSignal=SIGINT -TimeoutStopSec=10 - -[Install] -WantedBy=multi-user.target -- cgit v1.3.1