From 3214977e7a902b15d86c43a917c1438fdee56f95 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周六, 01 2月 2020 17:52:42 +0800
Subject: [PATCH] minor fix
---
.travis.yml | 72 +++++++++++++++++++++++++++---------
1 files changed, 54 insertions(+), 18 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 4cbd109..cac6349 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,12 @@
language: cpp
services: docker
-matrix:
+stages:
+ - name: test
+ - name: documentation
+ if: branch = develop
+
+jobs:
include:
- os: linux
dist: bionic
@@ -90,22 +95,22 @@
script:
- docker run --name centos7_make -v `pwd`:/root/open-license-manager centos7_configured /bin/bash -c
"cd /root/open-license-manager/build && make && make install && VIRT_ENV=CONTAINER make test"
-# - os: linux
-# dist: bionic
-# name: "CentOS-8 Docker"
-# before_script:
-# - docker run --name centos8_toconfigure -v `pwd`:/root/open-license-manager centos:centos8 /bin/bash -c \
-# "yum -y update && yum -y groupinstall 'Development Tools' &&
-# yum -y install wget cmake boost boost-devel openssl-devel zlib-devel &&
-# dnf -y --enablerepo=PowerTools install boost-static &&
-# wget https://github.com/openssl/openssl/archive/OpenSSL_1_1_1d.tar.gz &&
-# tar xzf OpenSSL_1_1_1d.tar.gz && cd openssl-OpenSSL_1_1_1d &&
-# ./config && make -j 8 && make install &&
-# cd /root/open-license-manager/build && cmake .."
-# - docker commit centos8_toconfigure centos8_configured
-# script:
-# - docker run --name centos8_make -v `pwd`:/root/open-license-manager centos8_configured /bin/bash -c \
-# "cd /root/open-license-manager/build && make && make install && VIRT_ENV=CONTAINER make test"
+ - os: linux
+ dist: bionic
+ name: "CentOS-8 Docker"
+ before_script:
+ - docker run --name centos8_toconfigure -v `pwd`:/root/open-license-manager centos:centos8 /bin/bash -c \
+ "yum -y update && yum -y groupinstall 'Development Tools' &&
+ yum -y install wget cmake boost boost-devel openssl-devel zlib-devel &&
+ dnf -y --enablerepo=PowerTools install boost-static &&
+ wget https://github.com/openssl/openssl/archive/OpenSSL_1_1_1d.tar.gz &&
+ tar xzf OpenSSL_1_1_1d.tar.gz && cd openssl-OpenSSL_1_1_1d &&
+ ./config && make -j 8 && make install &&
+ cd /root/open-license-manager/build && cmake .."
+ - docker commit centos8_toconfigure centos8_configured
+ script:
+ - docker run --name centos8_make -v `pwd`:/root/open-license-manager centos8_configured /bin/bash -c \
+ "cd /root/open-license-manager/build && make && make install && VIRT_ENV=CONTAINER make test"
- os: linux
dist: bionic
name: "Ubuntu 18.04 - MinGW cross-compile for Windows x64"
@@ -180,7 +185,38 @@
script:
- travis_wait 20 cmake --build . --target install --config Release
- ctest -C Release
-
+ - os: linux
+ dist: bionic
+ stage: documentation
+ name: "Deploy documentation"
+ addons:
+ apt:
+ packages:
+ - cmake
+ - libssl-dev
+ - zlib1g-dev
+ - libboost-dev
+ - libboost-test-dev
+ - libboost-filesystem-dev
+ - libboost-iostreams-dev
+ - libboost-program-options-dev
+ - libboost-system-dev
+ - libboost-thread-dev
+ - libboost-date-time-dev
+ - doxygen
+ - graphviz
+ script:
+ - make docs
+ deploy:
+ provider: pages
+ skip_cleanup: true
+ github_token: $GITHUB_TOKEN
+ keep_history: false
+ verbose: true
+ target_branch: "gh-pages"
+ local_dir: "build/html"
+ on:
+ branch: develop
env:
- CTEST_OUTPUT_ON_FAILURE=1
before_script:
--
Gitblit v1.9.1