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-ci.sh b/tests/tests-ci.sh index e054d0d8..6aa6beef 100755 --- a/tests/tests-ci.sh +++ b/tests/tests-ci.sh @@ -21,9 +21,12 @@ 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 /usr/local/lib/appimagekit linuxdeployqt.AppDir/usr/lib/ +cp -R /tmp/appimagekit.AppDir linuxdeployqt.AppDir/usr/appimagekit +pushd linuxdeployqt.AppDir/usr/bin +ln -s ../appimagekit/AppRun appimagetool +popd chmod +x linuxdeployqt.AppDir/AppRun find linuxdeployqt.AppDir/ if [ -z "$VERSION" ] ; then export VERSION=continuous ; fi @@ -52,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/appimagekit.AppDir/usr/lib ./linuxdeployqt-*-x86_64.AppImage --appimage-extract-and-run --version # TODO: reactivate tests diff --git a/tests/tests-environment.sh b/tests/tests-environment.sh index 2f175dc8..6a1edaf9 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 - +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 psmisc qt59translations +sudo apt-get -y install qt59base qt59declarative qt59webengine binutils xpra zsync desktop-file-utils gcc g++ make libgl1-mesa-dev psmisc qt59translations