fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2026-01-07 17:44:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Retry the commands if they timeout (#306)

Browse Source
This commit is contained in:
Alfredo Ramos
2018-08-11 13:27:57 -05:00
committed by Dharkael
parent ae9d18ce9e
commit b0000f8dcd
5 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@@ -60,20 +60,20 @@ matrix:
before_install:
- chmod +x travis/*.sh
- if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then travis/linux_before_install.sh; fi
- if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then source travis/linux_before_install.sh; fi
install:
- if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then travis/linux_install.sh; fi
- if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then source travis/linux_install.sh; fi
script:
# - git submodule update --init --recursive
# - git describe --long
- if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then travis/linux_script.sh; fi
# - if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then travis/osx_script.sh; fi
- if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then source travis/linux_script.sh; fi
# - if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then source travis/osx_script.sh; fi
- pwd && ls
after_success:
- if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then travis/linux_after_success.sh; fi
- if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then source travis/linux_after_success.sh; fi
# deploy:
# # Deploy packages to Github Release

6
travis/linux_after_success.sh
View File

@@ -5,20 +5,20 @@ set -e
DIST_PATH=dist
if [[ "${DIST}" == "trusty" ]]; then
curl \
travis_retry curl \
--upload-file \
"${DIST_PATH}"/flameshot_${ARCH}_${VERSION}.${EXTEN} \
"https://transfer.sh/flameshot_${ARCH}_${VERSION}.${EXTEN}"
else
case "${OS}" in
"ubuntu"|"debian")
curl \
travis_retry curl \
--upload-file \
"${DIST_PATH}"/flameshot_${VERSION}-${DIST}-${ARCH}_${ARCH}.${EXTEN} \
"https://transfer.sh/flameshot_${VERSION}-${DIST}-${ARCH}_${ARCH}.${EXTEN}"
;;
"fedora")
curl \
travis_retry curl \
--upload-file \
"${DIST_PATH}"/flameshot_${VERSION}-fedora${DIST}-${ARCH}_${ARCH}.${EXTEN} \
"https://transfer.sh/flameshot_${VERSION}-fedora${DIST}-${ARCH}_${ARCH}.${EXTEN}"

8
travis/linux_before_install.sh
View File

@@ -3,12 +3,12 @@
set -e
if [[ "${DIST}" == "trusty" ]]; then
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
sudo add-apt-repository -y ppa:beineri/opt-qt532-trusty
sudo apt-get -qq update
travis_retry sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
travis_retry sudo add-apt-repository -y ppa:beineri/opt-qt532-trusty
travis_retry sudo apt-get -qq update
# Get linuxdeployqt tool
wget \
travis_retry wget \
-c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" \
-O linuxdeployqt
chmod +x linuxdeployqt

14
travis/linux_install.sh
View File

@@ -3,25 +3,25 @@
set -e
if [[ "${DIST}" == "trusty" ]]; then
sudo apt-get install -qq build-essential git
travis_retry sudo apt-get install -qq build-essential git
sudo -E apt-get -yq \
travis_retry sudo -E apt-get -yq \
--no-install-suggests --no-install-recommends --force-yes \
install openssl libssl-dev
#sudo -E apt-get -yq \
#travis_retry sudo -E apt-get -yq \
# --no-install-suggests --no-install-recommends --force-yes \
# install libgl1-mesa-dev
sudo -E apt-get -yq \
travis_retry sudo -E apt-get -yq \
--no-install-suggests --no-install-recommends --force-yes \
install tree
sudo apt-get install -qq gcc-4.9 g++-4.9
travis_retry sudo apt-get install -qq gcc-4.9 g++-4.9
# Install qt5.3.2
sudo apt-get -y install qt53base qt53tools qt53svg
travis_retry sudo apt-get -y install qt53base qt53tools qt53svg
# Install fcitx-frontend-qt5
sudo apt-get -y install fcitx-frontend-qt5
travis_retry sudo apt-get -y install fcitx-frontend-qt5
fi

4
travis/linux_script.sh
View File

@@ -111,8 +111,8 @@ if [[ "${DIST}" == "trusty" ]]; then
"${DIST_PATH}"/flameshot_${ARCH}_${VERSION}.${EXTEN}
pwd
else
git clone https://github.com/packpack/packpack.git
packpack/packpack
travis_retry git clone https://github.com/packpack/packpack.git
travis_retry packpack/packpack
pwd && ls
case "${OS}" in