summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWu Xiaotian <[email protected]>2020-04-04 12:56:20 +0800
committerraveit65 <[email protected]>2022-07-20 23:41:35 +0200
commit382f8de466127f469f345d52b863aedf04bc0cc4 (patch)
tree59b045c2117a023fcf8345426c0d67044f01be92
parent1353a336fdf5cf023c3cdc91b9d5115d52aa96b5 (diff)
downloadcaja-382f8de466127f469f345d52b863aedf04bc0cc4.tar.bz2
caja-382f8de466127f469f345d52b863aedf04bc0cc4.tar.xz
[ci] fix build environment issue
-rw-r--r--.build.yml1
-rw-r--r--.travis.yml13
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 59346259..5b3deda8 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.*$"