From faffea78d76434ab29f39a0d907f17f2034a8717 Mon Sep 17 00:00:00 2001 From: Wu Xiaotian Date: Sat, 4 Apr 2020 12:56:20 +0800 Subject: [ci] fix build environment issue --- .build.yml | 1 + .travis.yml | 13 +++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.build.yml b/.build.yml index c134718d..fb9955b2 100644 --- a/.build.yml +++ b/.build.yml @@ -4,6 +4,7 @@ requires: archlinux: # Useful URL: https://git.archlinux.org/svntogit/community.git/tree/caja + - autoconf-archive - clang - gcc - git diff --git a/.travis.yml b/.travis.yml index 28934cf1..c7a6eb38 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ # vim: set ts=2 sts=2 sw=2 expandtab : dist: bionic -sudo: required language: shell os: linux services: @@ -28,17 +27,19 @@ script: deploy: - provider: pages - github-token: $GITHUB_TOKEN - #keep-history: true + token: $GITHUB_TOKEN + keep_history: false skip_cleanup: true - committer-from-gh: true - target-branch: gh-pages - local-dir: html-report + committer_from_gh: true + target_branch: gh-pages + local_dir: html-report + strategy: git on: all_branches: true condition: ${DISTRO} =~ ^fedora.*$ - provider: script script: ./docker-build --verbose --config .build.yml --release github + skip_cleanup: true on: tags: true condition: "${TRAVIS_TAG} =~ ^v.*$ && ${DISTRO} =~ ^fedora.*$" -- cgit v1.2.1