Skip to content

Commit

Permalink
use CentOS 7 to generate RPMs
Browse files Browse the repository at this point in the history
  • Loading branch information
calccrypto committed Jun 20, 2019
1 parent 77eb8b0 commit 6e341cd
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 24 deletions.
33 changes: 13 additions & 20 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ matrix:
- C_COMPILER=clang
- CXX_COMPILER=clang++
- BUILD=cmake
- DOCKER_IMAGE=centos
- DOCKER_IMAGE=centos:7
script: contrib/travis/centos7.sh

# # macOS 10.13 CMake
Expand Down Expand Up @@ -141,34 +141,27 @@ matrix:
# Build and push release packages
- stage: deploy
os: linux
sudo: false
sudo: true
dist: xenial
addons:
apt:
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-xenial-7
packages:
- attr
- cmake
- clang-7
- libattr1-dev
- libfuse-dev
- libpcre3-dev
- pkg-config
- rpm
update: true
update: false
services: docker
env:
- C_COMPILER=clang
- CXX_COMPILER=clang++
- BUILD=cmake
- DOCKER_IMAGE=centos:7
script:
- contrib/travis/xenial.sh
- cd build
- make package
- contrib/travis/centos7.sh
- docker exec "${TRAVIS_JOB_NUMBER}" yum install -y rpm-build
- docker exec "${TRAVIS_JOB_NUMBER}" make -C build package
deploy:
provider: releases
api_key: $GH_TOKEN
file_glob: true
file:
- "*.rpm"
- "*.tar.gz"
- "build/*.rpm"
skip_cleanup: true
on:
tags: true
Expand Down
8 changes: 4 additions & 4 deletions contrib/travis/centos7.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ cd ${SCRIPT_PATH}/../..

. ${SCRIPT_PATH}/start_docker.sh

# install Extra Packages for Enterprise Linux (EPEL) and The Software Collections ( SCL ) Repository
# install Extra Packages for Enterprise Linux (EPEL) and The Software Collections (SCL) Repository
de yum -y install epel-release centos-release-scl

# install libraries
de yum -y install fuse-devel libattr-devel libuuid-devel mariadb-devel pcre-devel
de yum -y install fuse-devel libattr1 pcre-devel

# install extra packages
de yum -y install cmake3 make patch pkgconfig rh-git29 tcl
de yum -y install cmake3 make patch pkgconfig rh-git29

# create symlinks
de ln -sf /opt/rh/rh-git29/root/usr/libexec/git-core/git /usr/bin/git
Expand Down Expand Up @@ -60,4 +60,4 @@ de useradd travis -m -s /sbin/nologin || true
de chown -R travis /GUFI

# build and test GUFI
docker exec --env C_COMPILER="${CENTOS_C_COMPILER}" --env CXX_COMPILER="${CENTOS_CXX_COMPILER}" --env BUILD="${BUILD}" --user travis "${TRAVIS_JOB_NUMBER}" bash -c "cd /GUFI && LD_LIBRARY_PATH=\"/opt/rh/httpd24/root/usr/lib64/:$(printenv LD_LIBRARY_PATH)\" PKG_CONFIG_PATH=\"/tmp/sqlite3/lib/pkgconfig:\$(printenv PKG_CONFIG_PATH)\" ${SCRIPT_PATH}/build_and_test.sh"
docker exec --env C_COMPILER="${CENTOS_C_COMPILER}" --env CXX_COMPILER="${CENTOS_CXX_COMPILER}" --env BUILD="${BUILD}" --user travis "${TRAVIS_JOB_NUMBER}" bash -c "cd /GUFI && LD_LIBRARY_PATH=\"/opt/rh/httpd24/root/usr/lib64/:\$(printenv LD_LIBRARY_PATH)\" PKG_CONFIG_PATH=\"/tmp/sqlite3/lib/pkgconfig:\$(printenv PKG_CONFIG_PATH)\" ${SCRIPT_PATH}/build_and_test.sh"

0 comments on commit 6e341cd

Please sign in to comment.