Fix rpm package generation.
continuous-integration/drone/push Build is passing Details

* Set CXX for CentOS in CI correctly.
* Install the right ImageMagick.
* Fix gpg call.
* Fixed signature path.
This commit is contained in:
tastytea 2019-07-30 14:08:07 +02:00
parent 904313abd9
commit 34eedfe6d1
Signed by: tastytea
GPG Key ID: CFC39497F1B26E07
1 changed files with 4 additions and 4 deletions

View File

@ -131,7 +131,7 @@ steps:
image: centos:7 image: centos:7
pull: always pull: always
environment: environment:
CXX: g++-6 CXX: /opt/rh/devtoolset-6/root/usr/bin/g++
CXXFLAGS: -pipe -O2 CXXFLAGS: -pipe -O2
LANG: en_US.utf-8 LANG: en_US.utf-8
commands: commands:
@ -141,15 +141,15 @@ steps:
- yum install -qy centos-release-scl - yum install -qy centos-release-scl
- yum install -qy devtoolset-6 - yum install -qy devtoolset-6
- scl enable devtoolset-6 bash - scl enable devtoolset-6 bash
- yum install -qy rpm-build ImageMagick-devel gnupg - yum install -qy rpm-build ImageMagick-c++-devel gnupg
- yum --enablerepo=epel install -qy cmake3 - yum --enablerepo=epel install -qy cmake3
- rm -rf build && mkdir -p build && cd build - rm -rf build && mkdir -p build && cd build
- cmake3 -DWITH_RPM=YES .. - cmake3 -DWITH_RPM=YES ..
- make package - make package
- gpg --import /var/autosign_gpg.key - gpg --import /var/autosign_gpg.key
- gpg --verbose --detach-sign *.deb - gpg --verbose --detach-sign *.rpm
- cp -v identiconpp-${DRONE_TAG}-0.x86_64.rpm .. - cp -v identiconpp-${DRONE_TAG}-0.x86_64.rpm ..
- cp -v identiconpp-${DRONE_TAG}-0.x86_64.sig .. - cp -v identiconpp-${DRONE_TAG}-0.x86_64.rpm.sig ..
volumes: volumes:
- name: centos-package-cache - name: centos-package-cache
path: /var/cache/yum path: /var/cache/yum