summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2020-02-20 19:40:00 +0100
committerraveit65 <[email protected]>2020-02-20 19:40:00 +0100
commit33554936aa2cfcefd7fa675d918b43a779203297 (patch)
tree62985950b54866a0f8692a6bac905d719c0669d0
parent897a11c196081a31b3cd6035270da28039cb0e52 (diff)
downloadmarco-33554936aa2cfcefd7fa675d918b43a779203297.tar.bz2
marco-33554936aa2cfcefd7fa675d918b43a779203297.tar.xz
travis: update config for new travis validation
-rw-r--r--.build.yml118
-rw-r--r--.travis.yml123
2 files changed, 121 insertions, 120 deletions
diff --git a/.build.yml b/.build.yml
new file mode 100644
index 00000000..897c8bdf
--- /dev/null
+++ b/.build.yml
@@ -0,0 +1,118 @@
+##########################################################
+# THE FOLLOWING LINES IS USED BY docker-build
+##########################################################
+requires:
+ archlinux:
+ # Useful URL: https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/marco
+ - gcc
+ - git
+ - glib2
+ - gtk3
+ - intltool
+ - libcanberra
+ - libgtop
+ - libxpresent
+ - make
+ - mate-common
+ - mate-desktop
+ - which
+ - yelp-tools
+ - zenity
+
+ debian:
+ # Useful URL: https://github.com/mate-desktop/debian-packages
+ # Useful URL: https://salsa.debian.org/debian-mate-team/marco
+ - git
+ - intltool
+ - libcanberra-gtk3-dev
+ - libglib2.0-dev
+ - libgtk-3-dev
+ - libgtop2-dev
+ - libice-dev
+ - libpango1.0-dev
+ - libsm-dev
+ - libstartup-notification0-dev
+ - libx11-dev
+ - libxcomposite-dev
+ - libxcursor-dev
+ - libxdamage-dev
+ - libxext-dev
+ - libxfixes-dev
+ - libxinerama-dev
+ - libxpresent-dev
+ - libxrandr-dev
+ - libxrender-dev
+ - libxt-dev
+ - make
+ - mate-common
+ - x11proto-present-dev
+ - yelp-tools
+ - zenity
+
+ fedora:
+ # Useful URL: https://src.fedoraproject.org/cgit/rpms/marco.git
+ - desktop-file-utils
+ - gcc
+ - git
+ - gtk3-devel
+ - libSM-devel
+ - libXdamage-devel
+ - libXpresent-devel
+ - libcanberra-devel
+ - libgtop2-devel
+ - libsoup-devel
+ - make
+ - mate-common
+ - mate-desktop-devel
+ - redhat-rpm-config
+ - startup-notification-devel
+ - yelp-tools
+ - zenity
+
+ ubuntu:
+ - git
+ - intltool
+ - libcanberra-gtk3-dev
+ - libglib2.0-dev
+ - libgtk-3-dev
+ - libgtop2-dev
+ - libice-dev
+ - libpango1.0-dev
+ - libsm-dev
+ - libstartup-notification0-dev
+ - libx11-dev
+ - libxcomposite-dev
+ - libxcursor-dev
+ - libxdamage-dev
+ - libxext-dev
+ - libxfixes-dev
+ - libxinerama-dev
+ - libxpresent-dev
+ - libxrandr-dev
+ - libxrender-dev
+ - libxt-dev
+ - make
+ - mate-common
+ - x11proto-present-dev
+ - yelp-tools
+ - zenity
+
+variables:
+ - CFLAGS="-Wall -Werror=format-security"
+
+after_scripts:
+ - make distcheck
+
+releases:
+ draft: false
+ prerelease: false
+ checksum: true
+ file_glob: true
+ files: marco-*.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 04baf18d..d59cd361 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
@@ -32,120 +32,3 @@ env:
- 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/trunk?h=packages/marco
- - gcc
- - git
- - glib2
- - gtk3
- - intltool
- - libcanberra
- - libgtop
- - libxpresent
- - make
- - mate-common
- - mate-desktop
- - which
- - yelp-tools
- - zenity
-
- debian:
- # Useful URL: https://github.com/mate-desktop/debian-packages
- # Useful URL: https://salsa.debian.org/debian-mate-team/marco
- - git
- - intltool
- - libcanberra-gtk3-dev
- - libglib2.0-dev
- - libgtk-3-dev
- - libgtop2-dev
- - libice-dev
- - libpango1.0-dev
- - libsm-dev
- - libstartup-notification0-dev
- - libx11-dev
- - libxcomposite-dev
- - libxcursor-dev
- - libxdamage-dev
- - libxext-dev
- - libxfixes-dev
- - libxinerama-dev
- - libxpresent-dev
- - libxrandr-dev
- - libxrender-dev
- - libxt-dev
- - make
- - mate-common
- - x11proto-present-dev
- - yelp-tools
- - zenity
-
- fedora:
- # Useful URL: https://src.fedoraproject.org/cgit/rpms/marco.git
- - desktop-file-utils
- - gcc
- - git
- - gtk3-devel
- - libSM-devel
- - libXdamage-devel
- - libXpresent-devel
- - libcanberra-devel
- - libgtop2-devel
- - libsoup-devel
- - make
- - mate-common
- - mate-desktop-devel
- - redhat-rpm-config
- - startup-notification-devel
- - yelp-tools
- - zenity
-
- ubuntu:
- - git
- - intltool
- - libcanberra-gtk3-dev
- - libglib2.0-dev
- - libgtk-3-dev
- - libgtop2-dev
- - libice-dev
- - libpango1.0-dev
- - libsm-dev
- - libstartup-notification0-dev
- - libx11-dev
- - libxcomposite-dev
- - libxcursor-dev
- - libxdamage-dev
- - libxext-dev
- - libxfixes-dev
- - libxinerama-dev
- - libxpresent-dev
- - libxrandr-dev
- - libxrender-dev
- - libxt-dev
- - make
- - mate-common
- - x11proto-present-dev
- - yelp-tools
- - zenity
-
-variables:
- - CFLAGS="-Wall -Werror=format-security"
-
-after_scripts:
- - make distcheck
-
-releases:
- draft: false
- prerelease: false
- checksum: true
- file_glob: true
- files: marco-*.tar.xz
- github_release:
- tags: true
- overwrite: true
- base_version: 1.20.0
- notify_servers:
- - https://release.mate-desktop.org/release