From a975e1dac2ac06aa60ac503d7f9798987c2c2a2f Mon Sep 17 00:00:00 2001 From: qurious-pixel <62252937+qurious-pixel@users.noreply.github.com> Date: Tue, 19 Jan 2021 10:45:23 -0800 Subject: [PATCH 1/3] update ccache fix ccache implementation --- .github/workflows/build.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a0d296a96..8851b81e8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,14 +12,19 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v2 - + - name: Prepare ccache timestamp + id: ccache_cache_timestamp + shell: cmake -P {0} + run: | + string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC) + message("::set-output name=timestamp::${current_date}") - name: cache uses: actions/cache@v2 with: - path: $HOME/.ccache - key: build-ccache + path: ~/.ccache + key: build-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }} restore-keys: | - build-ccache + build-ccache- - name: Build binary run: | mkdir -p "$HOME/.ccache" From b0ca4a21cf1807fcb91a3cb2a7c8f0fc209560eb Mon Sep 17 00:00:00 2001 From: qurious-pixel <62252937+qurious-pixel@users.noreply.github.com> Date: Tue, 19 Jan 2021 10:47:14 -0800 Subject: [PATCH 2/3] auto-restart after update --- .github/workflows/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update.sh b/.github/workflows/update.sh index f3c3d2578..bd5f3b765 100644 --- a/.github/workflows/update.sh +++ b/.github/workflows/update.sh @@ -6,7 +6,7 @@ zenity --question --timeout=10 --title="yuzu updater" --text="New update availab answer=$? if [ "$answer" -eq 0 ]; then - $APPDIR/usr/bin/AppImageUpdate $PWD/yuzu-x86_64.AppImage + $APPDIR/usr/bin/AppImageUpdate $PWD/yuzu-x86_64.AppImage && $PWD/yuzu-x86_64.AppImage elif [ "$answer" -eq 1 ]; then $APPDIR/usr/bin/yuzu elif [ "$answer" -eq 5 ]; then From eb66a02a96025118cb6e9a6dba51981e8ca9567d Mon Sep 17 00:00:00 2001 From: qurious-pixel <62252937+qurious-pixel@users.noreply.github.com> Date: Thu, 21 Jan 2021 19:50:31 -0800 Subject: [PATCH 3/3] skip update if offline skip checking for update if offline. --- .github/workflows/AppRun | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/AppRun b/.github/workflows/AppRun index fc1a71511..5abdbc969 100644 --- a/.github/workflows/AppRun +++ b/.github/workflows/AppRun @@ -7,8 +7,11 @@ mkdir -p $HOME/.local/share/icons/hicolor/scalable/apps && cp $APPDIR/yuzu.svg $ GITVER=`wget -qO- https://www.github.com/pineappleEA/pineapple-src/releases/tag/continuous | grep pineappleEA/pineapple-src/commit/ | cut -d '"' -f 2 | cut -d '/' -f 5 | awk '!x[$0]++'` APPVER=`cat $APPDIR/version.txt` -if [ "$GITVER" = "$APPVER" ]; then +if [[ -z "$GITVER" ]]; then + $APPDIR/usr/bin/yuzu +elif [ "$GITVER" = "$APPVER" ]; then $APPDIR/usr/bin/yuzu else $APPDIR/update.sh fi +