diff options
| author | Robert Tari <robert@tari.in> | 2020-12-22 22:50:16 +0100 |
|---|---|---|
| committer | Robert Tari <robert@tari.in> | 2020-12-22 22:50:16 +0100 |
| commit | f51b230fb93d309b6828ba94fbdc7295f15b3a57 (patch) | |
| tree | 68d9ab3ed978cc0f4b33282b90b5fcc97a7765d2 | |
| parent | bcc5cc528b375b265610336d86d4aff88db2dd49 (diff) | |
| parent | 46dc10a139f45e73771a1c39260391d3cb1ff0ba (diff) | |
| download | ayatana-ido-f51b230fb93d309b6828ba94fbdc7295f15b3a57.tar.gz ayatana-ido-f51b230fb93d309b6828ba94fbdc7295f15b3a57.tar.bz2 ayatana-ido-f51b230fb93d309b6828ba94fbdc7295f15b3a57.zip | |
Merge branch 'sunweaver-pr/travis-builds-against-fedora'
Attributes GH PR #24: https://github.com/AyatanaIndicators/ayatana-ido/pull/24
| -rw-r--r-- | .build.yml | 41 | ||||
| -rw-r--r-- | .travis.yml | 18 |
2 files changed, 38 insertions, 21 deletions
@@ -35,25 +35,28 @@ requires: - mate-common - valac -# fedora: -# - autoconf-archive -# - cairo-gobject-devel -# - clang-analyzer -# - clang -# - cppcheck-htmlreport -# - dconf-devel -# - desktop-file-utils -# - gcc -# - git -# - gobject-introspection-devel -# - gtk3-devel -# - iso-codes-devel -# - itstool -# - make -# - mate-common -# - meson -# - redhat-rpm-config -# - startup-notification-devel + fedora: + - autoconf-archive + - cairo-gobject-devel + - clang-analyzer + - clang + - cppcheck-htmlreport + - dconf-devel + - desktop-file-utils + - gcc + - git + - redhat-rpm-config + - startup-notification-devel + - glib2-devel + - gobject-introspection-devel + - gtest-devel + - gtk-doc + - gtk3-devel + - libX11-devel + - libXi-devel + - make + - mate-common + - vala ubuntu: - autopoint diff --git a/.travis.yml b/.travis.yml index a7e63c0..388dd4e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ before_install: # let's use the MATE project's docker build scripts... - curl -Ls -o docker-build https://github.com/mate-desktop/mate-dev-scripts/raw/master/travis/docker-build - curl -Ls -o gen-index https://github.com/mate-desktop/mate-dev-scripts/raw/master/travis/gen-index.sh - - sed -i gen-index -e "s/mate-desktop/ayatana-indicators/g" + - sed -i gen-index -e "s/mate-desktop.dev/ayatana-indicators.org/g" - chmod +x docker-build gen-index install: @@ -33,8 +33,22 @@ script: env: - DISTRO="archlinux:latest" - DISTRO="debian:testing" -# - DISTRO="fedora:latest" + - DISTRO="fedora:latest" - DISTRO="ubuntu:rolling" + +deploy: + - provider: pages + edge: true + token: ${GITHUB_TOKEN} + keep_history: true + committer_from_gh: true + target_branch: gh-pages + local_dir: html-report + strategy: git + on: + all_branches: true + condition: ${DISTRO} =~ ^fedora.*$ + jobs: exclude: - env: DISTRO="archlinux:latest" |