Skip to content

Commit

Permalink
Merge pull request probonopd#127 from TheAssassin/fix-segfaults-on-tr…
Browse files Browse the repository at this point in the history
…avis

Fix linuxdeployqt segfaults
  • Loading branch information
TheAssassin committed Jun 1, 2017
2 parents e785c90 + 31ac0ab commit 57e68b6
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 29 deletions.
18 changes: 0 additions & 18 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,3 @@ branches:
except:
- # Do not build tags that we create when we upload to GitHub Releases
- /^(?i:continuous)$/

notifications:
irc:
channels:
- "chat.freenode.net#AppImage"
on_success: always # options: [always|never|change] default: always
on_failure: always # options: [always|never|change] default: always
on_start: always # options: [always|never|change] default: always
template:
- "%{repository} build %{build_number}: %{result} %{build_url}"
use_notice: true
# skip_join: true
webhooks:
urls:
- https://webhooks.gitter.im/e/4bf20518805a55998cc2
on_success: always # options: [always|never|change] default: always
on_failure: always # options: [always|never|change] default: always
on_start: always # options: [always|never|change] default: always
22 changes: 19 additions & 3 deletions tests/tests-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
set -x

source /opt/qt*/bin/qt*-env.sh
/opt/qt*/bin/qmake linuxdeployqt.pro
make -j2
/opt/qt*/bin/qmake CONFIG+=release CONFIG+=force_debug_info linuxdeployqt.pro
make -j

mkdir -p linuxdeployqt.AppDir/usr/bin/
cp /usr/local/bin/{appimagetool,mksquashfs,patchelf,zsyncmake} linuxdeployqt.AppDir/usr/bin/
cp /usr/bin/patchelf /usr/local/bin/{appimagetool,mksquashfs,zsyncmake} linuxdeployqt.AppDir/usr/bin/
find linuxdeployqt.AppDir/
export VERSION=continuous
cp ./linuxdeployqt/linuxdeployqt linuxdeployqt.AppDir/usr/bin/
Expand All @@ -24,4 +24,20 @@ do
sleep 1;
done

# enable core dumps
echo "/tmp/coredump" | sudo tee /proc/sys/kernel/core_pattern

ulimit -c unlimited
ulimit -a -S
ulimit -a -H

bash -e tests/tests.sh

if [ $? -ne 0 ]; then
echo "FAILURE: linuxdeployqt CRASHED -- uploading files for debugging to transfer.sh"
set -v
[ -e /tmp/coredump ] && curl --upload-file /tmp/coredump https://transfer.sh/coredump
curl --upload-file linuxdeployqt-*-x86_64.AppImage https://transfer.sh/linuxdeployqt-x86_64.AppImage
find -type f -iname 'libQt5Core.so*' -exec curl --upload {} https://transfer.sh/libQt5Core.so \; || true
exit $RESULT
fi
10 changes: 2 additions & 8 deletions tests/tests-environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,8 @@ set -e
sudo add-apt-repository --yes ppa:beineri/opt-qt58-trusty
sudo apt-get update -qq

git clone -o 44b7f95 https://github.com/NixOS/patchelf.git
cd patchelf
bash ./bootstrap.sh
./configure
make -j2
sudo make install

cd -
wget http://ftp.de.debian.org/debian/pool/main/p/patchelf/patchelf_0.8-2_amd64.deb
sudo dpkg -i patchelf_0.8-2_amd64.deb

cd /tmp/
wget -c "https://github.com/probonopd/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage"
Expand Down

0 comments on commit 57e68b6

Please sign in to comment.