From b7f598b25117e21debdfcedef43a03cfc717a38a Mon Sep 17 00:00:00 2001 From: TheAssassin Date: Thu, 4 Aug 2022 02:16:32 +0200 Subject: [PATCH 01/10] Bundle appimagetool properly, mk. 1 --- tests/tests-ci.sh | 5 ++++- tests/tests-environment.sh | 11 +++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/tests/tests-ci.sh b/tests/tests-ci.sh index e054d0d8..5131c6e7 100755 --- a/tests/tests-ci.sh +++ b/tests/tests-ci.sh @@ -23,7 +23,10 @@ set -e mkdir -p linuxdeployqt.AppDir/usr/{bin,lib} cp /usr/bin/{patchelf,desktop-file-validate} /usr/local/bin/{appimagetool,zsyncmake} linuxdeployqt.AppDir/usr/bin/ cp ./bin/linuxdeployqt linuxdeployqt.AppDir/usr/bin/ -cp -r /usr/local/lib/appimagekit linuxdeployqt.AppDir/usr/lib/ +cp -R /tmp/appimagekit.AppDir linuxdeployqt.AppDir/usr/appimagekit +pushd linuxdeploy.AppDir/usr/bin +ln -s appimagetool ../appimagekit/AppRun +popd chmod +x linuxdeployqt.AppDir/AppRun find linuxdeployqt.AppDir/ if [ -z "$VERSION" ] ; then export VERSION=continuous ; fi diff --git a/tests/tests-environment.sh b/tests/tests-environment.sh index 2f175dc8..2b940bde 100755 --- a/tests/tests-environment.sh +++ b/tests/tests-environment.sh @@ -17,14 +17,13 @@ sudo dpkg -i patchelf_0.8-2_amd64.deb # make -j$(nproc) # sudo make install -cd /tmp/ +pushd /tmp/ # 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 wget -c "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage" chmod +x appimagetool*AppImage -./appimagetool*AppImage --appimage-extract -sudo cp squashfs-root/usr/bin/* /usr/local/bin/ -sudo cp -r squashfs-root/usr/lib/appimagekit /usr/local/lib/ -sudo chmod +rx /usr/local/lib/appimagekit -cd - +./appimagetool*AppImage --appimag-extract +mv squashfs-root/ appimagekit.AppDir/ +export PATH="$(readlink -f appimagekit.AppDir/)":"$PATH" +popd sudo apt-get -y install qt59base qt59declarative qt59webengine binutils xpra zsync desktop-file-utils gcc g++ make libgl1-mesa-dev fuse psmisc qt59translations From 77555bc2ee34d4dc6150df36fff303dbc4089a55 Mon Sep 17 00:00:00 2001 From: TheAssassin Date: Thu, 4 Aug 2022 02:20:51 +0200 Subject: [PATCH 02/10] Bundle appimagetool properly, mk. 2 --- tests/tests-environment.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/tests-environment.sh b/tests/tests-environment.sh index 2b940bde..2ba6bc1e 100755 --- a/tests/tests-environment.sh +++ b/tests/tests-environment.sh @@ -23,7 +23,7 @@ wget -c "https://github.com/AppImage/AppImageKit/releases/download/continuous/ap chmod +x appimagetool*AppImage ./appimagetool*AppImage --appimag-extract mv squashfs-root/ appimagekit.AppDir/ -export PATH="$(readlink -f appimagekit.AppDir/)":"$PATH" +sudo ln -s "$(readlink -f appimagekit.AppDir/AppRun)" /usr/bin/appimagetool popd -sudo apt-get -y install qt59base qt59declarative qt59webengine binutils xpra zsync desktop-file-utils gcc g++ make libgl1-mesa-dev fuse psmisc qt59translations +sudo apt-get -y install qt59base qt59declarative qt59webengine binutils xpra zsync desktop-file-utils gcc g++ make libgl1-mesa-dev fuse libfuse2 psmisc qt59translations From f4ced2cad0e1835872c2143239de9f092b133657 Mon Sep 17 00:00:00 2001 From: TheAssassin Date: Thu, 4 Aug 2022 02:23:08 +0200 Subject: [PATCH 03/10] Bundle appimagetool properly, mk. 3 --- tests/tests-environment.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/tests-environment.sh b/tests/tests-environment.sh index 2ba6bc1e..336b36f7 100755 --- a/tests/tests-environment.sh +++ b/tests/tests-environment.sh @@ -17,6 +17,8 @@ sudo dpkg -i patchelf_0.8-2_amd64.deb # make -j$(nproc) # sudo make install +sudo apt-get -y install qt59base qt59declarative qt59webengine binutils xpra zsync desktop-file-utils gcc g++ make libgl1-mesa-dev fuse libfuse2 psmisc qt59translations + pushd /tmp/ # 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 wget -c "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage" @@ -25,5 +27,3 @@ chmod +x appimagetool*AppImage mv squashfs-root/ appimagekit.AppDir/ sudo ln -s "$(readlink -f appimagekit.AppDir/AppRun)" /usr/bin/appimagetool popd - -sudo apt-get -y install qt59base qt59declarative qt59webengine binutils xpra zsync desktop-file-utils gcc g++ make libgl1-mesa-dev fuse libfuse2 psmisc qt59translations From 3e3dfef47053514e988fbade45ad758a2004714f Mon Sep 17 00:00:00 2001 From: TheAssassin Date: Thu, 4 Aug 2022 02:26:33 +0200 Subject: [PATCH 04/10] Bundle appimagetool properly, mk. 4 --- .github/workflows/build.yaml | 1 + tests/tests-environment.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8ad3d73a..3bd41727 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -10,6 +10,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} TRAVIS_BUILD_NUMBER: ${{ github.run_number }} VERSION: continuous + APPIMAGE_EXTRACT_AND_RUN: 1 steps: - name: Configure build machine run: | diff --git a/tests/tests-environment.sh b/tests/tests-environment.sh index 336b36f7..882a0cbd 100755 --- a/tests/tests-environment.sh +++ b/tests/tests-environment.sh @@ -17,8 +17,6 @@ sudo dpkg -i patchelf_0.8-2_amd64.deb # make -j$(nproc) # sudo make install -sudo apt-get -y install qt59base qt59declarative qt59webengine binutils xpra zsync desktop-file-utils gcc g++ make libgl1-mesa-dev fuse libfuse2 psmisc qt59translations - pushd /tmp/ # 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 wget -c "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage" @@ -27,3 +25,5 @@ chmod +x appimagetool*AppImage mv squashfs-root/ appimagekit.AppDir/ sudo ln -s "$(readlink -f appimagekit.AppDir/AppRun)" /usr/bin/appimagetool popd + +sudo apt-get -y install qt59base qt59declarative qt59webengine binutils xpra zsync desktop-file-utils gcc g++ make libgl1-mesa-dev psmisc qt59translations From df8846d0346b03a63d684449c684021d93525e13 Mon Sep 17 00:00:00 2001 From: TheAssassin Date: Thu, 4 Aug 2022 02:28:45 +0200 Subject: [PATCH 05/10] Bundle appimagetool properly, mk. 5 --- tests/tests-environment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests-environment.sh b/tests/tests-environment.sh index 882a0cbd..6a1edaf9 100755 --- a/tests/tests-environment.sh +++ b/tests/tests-environment.sh @@ -21,7 +21,7 @@ pushd /tmp/ # 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 wget -c "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage" chmod +x appimagetool*AppImage -./appimagetool*AppImage --appimag-extract +./appimagetool*AppImage --appimage-extract mv squashfs-root/ appimagekit.AppDir/ sudo ln -s "$(readlink -f appimagekit.AppDir/AppRun)" /usr/bin/appimagetool popd From e1d8a77e0a2eea184d479eb65e31e6e3919a4686 Mon Sep 17 00:00:00 2001 From: TheAssassin Date: Thu, 4 Aug 2022 02:32:37 +0200 Subject: [PATCH 06/10] Bundle appimagetool properly, mk. 6 --- tests/tests-ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests-ci.sh b/tests/tests-ci.sh index 5131c6e7..a118a737 100755 --- a/tests/tests-ci.sh +++ b/tests/tests-ci.sh @@ -21,7 +21,7 @@ make -j$(nproc) set -e mkdir -p linuxdeployqt.AppDir/usr/{bin,lib} -cp /usr/bin/{patchelf,desktop-file-validate} /usr/local/bin/{appimagetool,zsyncmake} linuxdeployqt.AppDir/usr/bin/ +cp /usr/bin/{patchelf,desktop-file-validate} linuxdeployqt.AppDir/usr/bin/ cp ./bin/linuxdeployqt linuxdeployqt.AppDir/usr/bin/ cp -R /tmp/appimagekit.AppDir linuxdeployqt.AppDir/usr/appimagekit pushd linuxdeploy.AppDir/usr/bin From 2c34090eb4858f3e11e7ed57345d6bc4755c0d09 Mon Sep 17 00:00:00 2001 From: TheAssassin Date: Thu, 4 Aug 2022 03:46:18 +0200 Subject: [PATCH 07/10] Bundle appimagetool properly, mk. 7 --- tests/tests-ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests-ci.sh b/tests/tests-ci.sh index a118a737..0ba759f8 100755 --- a/tests/tests-ci.sh +++ b/tests/tests-ci.sh @@ -24,7 +24,7 @@ mkdir -p linuxdeployqt.AppDir/usr/{bin,lib} cp /usr/bin/{patchelf,desktop-file-validate} linuxdeployqt.AppDir/usr/bin/ cp ./bin/linuxdeployqt linuxdeployqt.AppDir/usr/bin/ cp -R /tmp/appimagekit.AppDir linuxdeployqt.AppDir/usr/appimagekit -pushd linuxdeploy.AppDir/usr/bin +pushd linuxdeployqt.AppDir/usr/bin ln -s appimagetool ../appimagekit/AppRun popd chmod +x linuxdeployqt.AppDir/AppRun From 10d1e5f76f0f81df032df126d9ad302f8d5f6b42 Mon Sep 17 00:00:00 2001 From: TheAssassin Date: Thu, 4 Aug 2022 03:48:44 +0200 Subject: [PATCH 08/10] Bundle appimagetool properly, mk. 8 --- tests/tests-ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests-ci.sh b/tests/tests-ci.sh index 0ba759f8..71d84301 100755 --- a/tests/tests-ci.sh +++ b/tests/tests-ci.sh @@ -25,7 +25,7 @@ cp /usr/bin/{patchelf,desktop-file-validate} linuxdeployqt.AppDir/usr/bin/ cp ./bin/linuxdeployqt linuxdeployqt.AppDir/usr/bin/ cp -R /tmp/appimagekit.AppDir linuxdeployqt.AppDir/usr/appimagekit pushd linuxdeployqt.AppDir/usr/bin -ln -s appimagetool ../appimagekit/AppRun +ln -s ../appimagekit/AppRun appimagetool popd chmod +x linuxdeployqt.AppDir/AppRun find linuxdeployqt.AppDir/ From 07e11cb0aaee98c3d9d35d6e01259100fdd2c3a1 Mon Sep 17 00:00:00 2001 From: TheAssassin Date: Thu, 4 Aug 2022 03:51:09 +0200 Subject: [PATCH 09/10] Bundle appimagetool properly, mk. 9 --- tests/tests-ci.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/tests-ci.sh b/tests/tests-ci.sh index 71d84301..09503e1c 100755 --- a/tests/tests-ci.sh +++ b/tests/tests-ci.sh @@ -55,6 +55,7 @@ ulimit -a -H set +e # print version number (need to extract the AppImage because we are running in a container, see https://github.com/AppImage/AppImageKit/wiki/FUSE#docker) +export LD_LIBRARY_PATH=/tmp/appimagetool.AppDir/usr/lib ./linuxdeployqt-*-x86_64.AppImage --appimage-extract-and-run --version # TODO: reactivate tests From d457848b9cfd35954301f8a03a7d281da9054ec7 Mon Sep 17 00:00:00 2001 From: TheAssassin Date: Thu, 4 Aug 2022 03:53:53 +0200 Subject: [PATCH 10/10] Bundle appimagetool properly, mk. 10 --- tests/tests-ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests-ci.sh b/tests/tests-ci.sh index 09503e1c..6aa6beef 100755 --- a/tests/tests-ci.sh +++ b/tests/tests-ci.sh @@ -55,7 +55,7 @@ ulimit -a -H set +e # print version number (need to extract the AppImage because we are running in a container, see https://github.com/AppImage/AppImageKit/wiki/FUSE#docker) -export LD_LIBRARY_PATH=/tmp/appimagetool.AppDir/usr/lib +export LD_LIBRARY_PATH=/tmp/appimagekit.AppDir/usr/lib ./linuxdeployqt-*-x86_64.AppImage --appimage-extract-and-run --version # TODO: reactivate tests