summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPablo Barciela <[email protected]>2020-02-22 11:39:57 +0100
committerPablo Barciela <[email protected]>2020-02-22 11:59:05 +0100
commit74e341c3c141027bee3f0edd4deae5c6ca952bd5 (patch)
tree7aaccfd9979f6cffe2579c1c84e599245e57aefa
parent6acd4e45847a6f19f65899f9a790d0edeebb8f81 (diff)
downloadmate-user-guide-74e341c3c141027bee3f0edd4deae5c6ca952bd5.tar.bz2
mate-user-guide-74e341c3c141027bee3f0edd4deae5c6ca952bd5.tar.xz
Travis CI: Fix build error, add .build.yml
-rw-r--r--.build.yml70
-rw-r--r--.travis.yml83
2 files changed, 73 insertions, 80 deletions
diff --git a/.build.yml b/.build.yml
new file mode 100644
index 0000000..f1c626d
--- /dev/null
+++ b/.build.yml
@@ -0,0 +1,70 @@
+##########################################################
+# THE FOLLOWING LINES IS USED BY docker-build
+##########################################################
+requires:
+ archlinux:
+ # Useful URL: https://git.archlinux.org/svntogit/community.git/tree/mate-user-guide
+ - gcc
+ - git
+ - intltool
+ - itstool
+ - make
+ - mate-common
+ - which
+ - yelp-tools
+
+ debian:
+ # Useful URL: https://github.com/mate-desktop/debian-packages
+ # Useful URL: https://salsa.debian.org/debian-mate-team/mate-user-guide
+ - autopoint
+ - gettext
+ - git
+ - intltool
+ - libglib2.0-dev
+ - make
+ - mate-common
+ - yelp-tools
+
+ fedora:
+ # Useful URL: https://src.fedoraproject.org/cgit/rpms/mate-user-guide.git
+ - desktop-file-utils
+ - gcc
+ - git
+ - make
+ - mate-common
+ - redhat-rpm-config
+ - yelp-tools
+
+ ubuntu:
+ - autopoint
+ - gettext
+ - git
+ - intltool
+ - libglib2.0-dev
+ - make
+ - mate-common
+ - yelp-tools
+
+variables:
+ - CFLAGS="-Wall -Werror=format-security"
+
+after_scripts:
+ - if [ ${DISTRO_NAME} == "fedora" ];then
+ - mkdir -p help-html
+ - yelp-build html -o help-html mate-user-guide/C/index.docbook
+ - echo "mate-user-guide.mate-desktop.dev" > help-html/CNAME
+ - fi
+ - make distcheck
+
+releases:
+ draft: false
+ prerelease: false
+ checksum: true
+ file_glob: true
+ files: mate-user-guide-*.tar.xz
+ github_release:
+ tags: true
+ overwrite: true
+ base_version: 1.20.0
+ notify_servers:
+ - https://release.mate-desktop.org/release
diff --git a/.travis.yml b/.travis.yml
index ad363cc..b89f4cf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,10 +17,10 @@ install:
- sudo apt-get install -y python3-pip python3-setuptools
- sudo pip3 install --upgrade pip
- sudo pip install PyGithub
- - ./docker-build --name ${DISTRO} --config .travis.yml --install
+ - ./docker-build --name ${DISTRO} --config .build.yml --install
script:
- - ./docker-build --name ${DISTRO} --verbose --config .travis.yml --build autotools
+ - ./docker-build --name ${DISTRO} --verbose --config .build.yml --build autotools
deploy:
- provider: pages
@@ -34,7 +34,7 @@ deploy:
all_branches: true
condition: ${DISTRO} =~ ^fedora.*$
- provider: script
- script: ./docker-build --verbose --config .travis.yml --release github
+ script: ./docker-build --verbose --config .build.yml --release github
skip_cleanup: true
on:
tags: true
@@ -56,80 +56,3 @@ env:
- DISTRO="debian:testing"
- DISTRO="fedora:latest"
- DISTRO="ubuntu:19.10"
-
-##########################################################
-# THE FOLLOWING LINES IS USED BY docker-build
-##########################################################
-requires:
- archlinux:
- # Useful URL: https://git.archlinux.org/svntogit/community.git/tree/mate-user-guide
- - gcc
- - git
- - intltool
- - itstool
- - make
- - mate-common
- - which
- - yelp-tools
-
- debian:
- # Useful URL: https://github.com/mate-desktop/debian-packages
- # Useful URL: https://salsa.debian.org/debian-mate-team/mate-user-guide
- - autopoint
- - gettext
- - git
- - intltool
- - libglib2.0-dev
- - make
- - mate-common
- - yelp-tools
-
- fedora:
- # Useful URL: https://src.fedoraproject.org/cgit/rpms/mate-user-guide.git
- - desktop-file-utils
- - gcc
- - git
- - make
- - mate-common
- - redhat-rpm-config
- - yelp-tools
-
- ubuntu:
- - autopoint
- - gettext
- - git
- - intltool
- - libglib2.0-dev
- - make
- - mate-common
- - yelp-tools
-
-variables:
- - CFLAGS="-Wall -Werror=format-security"
-
-before_scripts:
-# - if [ ${DISTRO_NAME} == "debian" ];then
-# - curl -Ls -o debian.sh https://github.com/mate-desktop/mate-dev-scripts/raw/master/travis/debian.sh
-# - bash ./debian.sh
-# - fi
-
-after_scripts:
- - if [ ${DISTRO_NAME} == "fedora" ];then
- - mkdir -p help-html
- - yelp-build html -o help-html mate-user-guide/C/index.docbook
- - echo "mate-user-guide.mate-desktop.dev" > help-html/CNAME
- - fi
- - make distcheck
-
-releases:
- draft: false
- prerelease: false
- checksum: true
- file_glob: true
- files: mate-user-guide-*.tar.xz
- github_release:
- tags: true
- overwrite: true
- base_version: 1.20.0
- notify_servers:
- - https://release.mate-desktop.org/release