From ea8a689f9e31a2ae632298275c237caa8b0301e6 Mon Sep 17 00:00:00 2001 From: Yuriy Puchkov Date: Thu, 13 Aug 2020 12:44:34 +0300 Subject: [PATCH 1/6] fix - ubuntu 18.04 and 20.04 package build --- .travis.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index feb18b0c..14fe993b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,14 @@ sudo: required language: cpp +addons: + artifacts: true + branches: only: - master - master_nc + - bugfix/RND-467-screenshot-ubuntu-packages-are-broken-18.04-20.04 cache: directories: @@ -84,9 +88,9 @@ script: - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then source .travis/linux_script.sh; fi # - if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then source .travis/osx_script.sh; fi -after_success: - - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then source .travis/linux_after_success.sh; fi - - echo "Download URL is $TEMP_DOWNLOAD_URL ." +#after_success: +# - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then source .travis/linux_after_success.sh; fi +# - echo "Download URL is ${TEMP_DOWNLOAD_URL} " # deploy: # # Deploy packages to Github Release From ce9459f3efee7b97d308cc3e20dcea89d1573bb7 Mon Sep 17 00:00:00 2001 From: Yuriy Puchkov Date: Thu, 13 Aug 2020 16:22:44 +0300 Subject: [PATCH 2/6] Add Fedora 31, 32 dists --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index 14fe993b..1ffbc56a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,6 +45,14 @@ matrix: # 30 env: OS=fedora DIST=30 EXTEN=rpm services: docker + - os: linux + # 31 + env: OS=fedora DIST=31 EXTEN=rpm + services: docker + - os: linux + # 32 + env: OS=fedora DIST=32 EXTEN=rpm + services: docker - os: linux # Ubuntu 16.04 LTS env: OS=ubuntu DIST=xenial EXTEN=deb From 3cb5155f55ee9e101253a57bc3967288b61b0a9c Mon Sep 17 00:00:00 2001 From: Yuriy Puchkov Date: Mon, 17 Aug 2020 22:35:18 +0300 Subject: [PATCH 3/6] Remove old fedora distros --- .travis.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1ffbc56a..ce2f02bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,18 +33,6 @@ env: # https://hub.docker.com/r/vitzy/flameshot/tags/ matrix: include: - - os: linux - # 28 - env: OS=fedora DIST=28 EXTEN=rpm - services: docker - - os: linux - # 29 - env: OS=fedora DIST=29 EXTEN=rpm - services: docker - - os: linux - # 30 - env: OS=fedora DIST=30 EXTEN=rpm - services: docker - os: linux # 31 env: OS=fedora DIST=31 EXTEN=rpm @@ -65,10 +53,6 @@ matrix: # Ubuntu 20.04 LTS env: OS=ubuntu DIST=focal EXTEN=deb services: docker - - os: linux - # 8 - env: OS=debian DIST=jessie EXTEN=deb - services: docker - os: linux # 9 env: OS=debian DIST=stretch EXTEN=deb From d81ebb724007877ec33f06702e052787a545d166 Mon Sep 17 00:00:00 2001 From: Yuriy Puchkov Date: Tue, 18 Aug 2020 13:07:33 +0300 Subject: [PATCH 4/6] Add mac os build --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ce2f02bd..d78eb2fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,9 +61,9 @@ matrix: # No docker environment, just for CI build & test # ubuntu xenial; default Qt version is 5.6.1 env: OS=ubuntu DIST=xenial EXTEN=other -# - os: osx -# compiler: clang -# osx_image: xcode9.2 + - os: osx + compiler: clang + osx_image: xcode9.2 before_install: - export ROOT_PATH="$(pwd)" From a2860f9b447e0fadaa922ef473a04f200075553d Mon Sep 17 00:00:00 2001 From: Yuriy Puchkov Date: Tue, 18 Aug 2020 13:51:52 +0300 Subject: [PATCH 5/6] Update debian distros build --- .travis.yml | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index d78eb2fe..3eed9010 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,6 @@ branches: only: - master - master_nc - - bugfix/RND-467-screenshot-ubuntu-packages-are-broken-18.04-20.04 cache: directories: @@ -34,34 +33,44 @@ env: matrix: include: - os: linux - # 31 + # 1 - Fedora 31 env: OS=fedora DIST=31 EXTEN=rpm services: docker - os: linux - # 32 + # 2 - Fedora 32 env: OS=fedora DIST=32 EXTEN=rpm services: docker - os: linux - # Ubuntu 16.04 LTS + # 3 - Ubuntu 16.04 LTS env: OS=ubuntu DIST=xenial EXTEN=deb services: docker - os: linux - # Ubuntu 18.04 LTS + # 4 - Ubuntu 18.04 LTS env: OS=ubuntu DIST=bionic EXTEN=deb services: docker - os: linux - # Ubuntu 20.04 LTS + # 5 - Ubuntu 20.04 LTS env: OS=ubuntu DIST=focal EXTEN=deb services: docker - os: linux - # 9 + # 6 - Debian stretch env: OS=debian DIST=stretch EXTEN=deb services: docker - os: linux + # 7 - Debian 9 (stretch) + env: OS=debian DIST=stretch EXTEN=deb + services: docker + - os: linux + # 8 - Debian 10 (buster) + env: OS=debian DIST=buster EXTEN=deb + services: docker + - os: linux + # 8 # No docker environment, just for CI build & test # ubuntu xenial; default Qt version is 5.6.1 env: OS=ubuntu DIST=xenial EXTEN=other - os: osx + # 9 - MacOS compiler: clang osx_image: xcode9.2 From 491ac0874ae430d1bede0d5a4fc409331fc8b6f1 Mon Sep 17 00:00:00 2001 From: Yuriy Puchkov Date: Tue, 18 Aug 2020 14:04:27 +0300 Subject: [PATCH 6/6] Remove bugfix branch build --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3eed9010..d5246d23 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,10 +69,10 @@ matrix: # No docker environment, just for CI build & test # ubuntu xenial; default Qt version is 5.6.1 env: OS=ubuntu DIST=xenial EXTEN=other - - os: osx - # 9 - MacOS - compiler: clang - osx_image: xcode9.2 +# - os: osx +# # 9 - MacOS +# compiler: clang +# osx_image: xcode9.2 before_install: - export ROOT_PATH="$(pwd)"