From 6a9f89e58389aa5d79190901e36d4f5506bb43a2 Mon Sep 17 00:00:00 2001 From: qurious-pixel <62252937+qurious-pixel@users.noreply.github.com> Date: Tue, 29 Dec 2020 15:08:29 -0800 Subject: [PATCH] fix version fix version separate continuous from version --- .github/workflows/appimage.sh | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/.github/workflows/appimage.sh b/.github/workflows/appimage.sh index 3e97dca86..fcf7931f1 100644 --- a/.github/workflows/appimage.sh +++ b/.github/workflows/appimage.sh @@ -31,9 +31,7 @@ mkdir -p squashfs-root/usr/share/icons && cp ./squashfs-root/yuzu.svg ./squashfs mkdir -p squashfs-root/usr/share/icons/hicolor/scalable/apps && cp ./squashfs-root/yuzu.svg ./squashfs-root/usr/share/icons/hicolor/scalable/apps mkdir -p squashfs-root/usr/share/pixmaps && cp ./squashfs-root/yuzu.svg ./squashfs-root/usr/share/pixmaps curl -sL "https://raw.githubusercontent.com/$GITHUB_REPOSITORY/$BRANCH/.github/workflows/update.sh" -o $HOME/squashfs-root/update.sh -curl -sL "https://raw.githubusercontent.com/$GITHUB_REPOSITORY/$BRANCH/.github/workflows/AppRun" -o $HOME/squashfs-root/AppRun chmod a+x ./squashfs-root/runtime -chmod a+x ./squashfs-root/AppRun chmod a+x ./squashfs-root/update.sh #cp /tmp/libssl.so.47 /tmp/libcrypto.so.45 /usr/lib/x86_64-linux-gnu/ @@ -43,20 +41,30 @@ unset QT_PLUGIN_PATH unset LD_LIBRARY_PATH unset QTDIR +mkdir $HOME/artifacts/ +mkdir -p /yuzu/artifacts/version +# Version AppImage +curl -sL https://github.com/AppImage/AppImageKit/releases/download/continuous/AppRun-x86_64 -o $HOME/squashfs-root/AppRun +chmod a+x ./squashfs-root/AppRun # /tmp/squashfs-root/AppRun $HOME/squashfs-root/usr/bin/yuzu -appimage -unsupported-allow-new-glibc -no-copy-copyright-files -no-translations -bundle-non-qt-libs /tmp/squashfs-root/AppRun $HOME/squashfs-root/usr/bin/yuzu -unsupported-allow-new-glibc -no-copy-copyright-files -no-translations -bundle-non-qt-libs export PATH=$(readlink -f /tmp/squashfs-root/usr/bin/):$PATH +/tmp/squashfs-root/usr/bin/appimagetool $HOME/squashfs-root +version=$(cat /yuzu/README.md | grep -o 'early-access [[:digit:]]*' | cut -c 14-17) +mv ./yuzu-x86_64.AppImage /yuzu/artifacts/version/Yuzu-EA-$version.AppImage + +# Continuous AppImage +rm $HOME/squashfs-root/AppRun +curl -sL "https://raw.githubusercontent.com/$GITHUB_REPOSITORY/$BRANCH/.github/workflows/AppRun" -o $HOME/squashfs-root/AppRun +chmod a+x ./squashfs-root/AppRun mv /tmp/update/AppImageUpdate $HOME/squashfs-root/usr/bin/ mv /tmp/update/* $HOME/squashfs-root/usr/lib/ /tmp/squashfs-root/usr/bin/appimagetool $HOME/squashfs-root -u "gh-releases-zsync|qurious-pixel|pineapple-src|continuous|yuzu-x86_64.AppImage.zsync" -mkdir $HOME/artifacts/ -mkdir -p /yuzu/artifacts/version mv yuzu-x86_64.AppImage* /yuzu/artifacts -version=$(cat /yuzu/README.md | grep -o 'early-access [[:digit:]]*' | cut -c 14-17) -cp /yuzu/artifacts/yuzu-x86_64.AppImage /yuzu/artifacts/version/Yuzu-EA-$version.AppImage + cp -R $HOME/artifacts/ /yuzu/ -cp "$BUILDBIN"/yuzu /yuzu/artifacts +cp "$BUILDBIN"/yuzu /yuzu/artifacts/version/ chmod -R 777 /yuzu/artifacts cd /yuzu/artifacts ls -al /yuzu/artifacts/