Skip to content

Commit 591e2e7

Browse files
authored
Use new appimagetool (#640)
1 parent 0393b84 commit 591e2e7

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

tests/tests-ci.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ set -e
2828
mkdir -p linuxdeployqt.AppDir/usr/{bin,lib}
2929
cp /usr/bin/{patchelf,desktop-file-validate} /usr/local/bin/{appimagetool,zsyncmake} linuxdeployqt.AppDir/usr/bin/
3030
cp ./bin/linuxdeployqt linuxdeployqt.AppDir/usr/bin/
31-
cp -r /usr/local/lib/appimagekit linuxdeployqt.AppDir/usr/lib/
31+
# cp -r /usr/local/lib/appimagekit linuxdeployqt.AppDir/usr/lib/
3232
chmod +x linuxdeployqt.AppDir/AppRun
3333
find linuxdeployqt.AppDir/
3434
if [ -z "$VERSION" ] ; then export VERSION=continuous ; fi

tests/tests-environment.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,13 @@ sudo dpkg -i patchelf_0.8-2_*.deb
2929
cd /tmp/
3030
# wget -c https://artifacts.assassinate-you.net/artifactory/AppImageKit/travis-2052/appimagetool-x86_64.AppImage # branch last-good, https://travis-ci.org/AppImage/AppImageKit/jobs/507462541
3131
# wget -c "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage" # See #542
32-
wget -c "https://github.com/AppImage/AppImageKit/releases/download/13/appimagetool-$tool_arch.AppImage" # Workaround for #542
32+
# wget -c "https://github.com/AppImage/AppImageKit/releases/download/13/appimagetool-$tool_arch.AppImage" # Workaround for #542
33+
wget -c "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-$tool_arch.AppImage"
3334
chmod +x appimagetool*AppImage
3435
./appimagetool*AppImage --appimage-extract
3536
sudo cp squashfs-root/usr/bin/* /usr/local/bin/
36-
sudo cp -r squashfs-root/usr/lib/appimagekit /usr/local/lib/
37-
sudo chmod +rx /usr/local/lib/appimagekit
37+
# sudo cp -r squashfs-root/usr/lib/appimagekit /usr/local/lib/
38+
# sudo chmod +rx /usr/local/lib/appimagekit
3839
cd -
3940

4041
sudo apt-get -y install qt5-default qtbase5-dev qtdeclarative5-dev qtwebengine5-dev qttranslations5-l10n binutils xpra zsync desktop-file-utils gcc g++ make libgl1-mesa-dev fuse psmisc

0 commit comments

Comments
 (0)