From dcb260e1503959d48c4bfae91c6eb8ac327fc0d2 Mon Sep 17 00:00:00 2001 From: ale Date: Sun, 4 Oct 2020 16:14:38 +0200 Subject: [PATCH] solved rpm path --- .drone.yml | 9 +++++---- lch.spec | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index 3cbea82..8ab9336 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,10 +12,10 @@ steps: - export DEBIAN_FRONTEND=noninteractive - apt-get update && apt-get install -y dpkg-dev debhelper - dpkg-buildpackage -us -uc - - cp ../lch_0.6.10_all.deb . - - dpkg -i lch_0.6.10_all.deb + - cp ../*.deb . + - dpkg -i *.deb - lch -v - - cp lch_0.6.10_all.deb /debian + - rm -rf /debian/* && cp *.deb /debian - name: Build CentOS rpm package image: centos @@ -25,7 +25,8 @@ steps: commands: - yum -qy install rpm-build - rpmbuild --target noarch -bb lch.spec - - rpm -i /root/rpmbuild/RPMS/noarch/* + - rm -rf /root/rpmbuild/RPMS/noarch/* + - rpm -i /root/rpmbuild/RPMS/noarch/*.rpm - lch -v volumes: diff --git a/lch.spec b/lch.spec index 66890ca..153ff9a 100644 --- a/lch.spec +++ b/lch.spec @@ -30,8 +30,8 @@ echo "BUILDROOT = $RPM_BUILD_ROOT" mkdir -p $RPM_BUILD_ROOT/usr/bin mkdir -p $RPM_BUILD_ROOT/usr/lib/lch -cp /drone/src/lch $RPM_BUILD_ROOT/usr/bin -cp -r /drone/src/lib/* $RPM_BUILD_ROOT/usr/lib/lch +cp $OLDPWD/lch $RPM_BUILD_ROOT/usr/bin +cp -r $OLDPWD/lib/* $RPM_BUILD_ROOT/usr/lib/lch exit