From 57d6522f39909691aebc23d7a7cc90b908fd8df9 Mon Sep 17 00:00:00 2001 From: Pablo Barciela Date: Sat, 22 Feb 2020 11:41:40 +0100 Subject: Travis CI: Fix build error, add .build.yml --- .build.yml | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ .travis.yml | 75 +++---------------------------------------------------------- 2 files changed, 71 insertions(+), 72 deletions(-) create mode 100644 .build.yml diff --git a/.build.yml b/.build.yml new file mode 100644 index 0000000..f55dd35 --- /dev/null +++ b/.build.yml @@ -0,0 +1,68 @@ +########################################################## +# 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 + - 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 + + ubuntu: + - 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: + - 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 ed3e64a..02f08c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,14 +13,14 @@ 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: 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 @@ -31,72 +31,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 - - 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 - - ubuntu: - - 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: - - 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 -- cgit v1.2.1