diff --git a/.github/workflows/AppRun b/.github/workflows/AppRun index 5abdbc969..7cfe3fa71 100644 --- a/.github/workflows/AppRun +++ b/.github/workflows/AppRun @@ -4,7 +4,7 @@ export QT_QPA_PLATFORMTHEME=gtk3 mkdir -p $HOME/.local/share/icons/hicolor/scalable/apps && cp $APPDIR/yuzu.svg $HOME/.local/share/icons/hicolor/scalable/apps -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]++'` +GITVER=`wget -qO- https://api.github.com/repos/pineappleEA/pineapple-src/releases/latest | grep "releases/tag" | grep -o 'EA-[[:digit:]]*'` APPVER=`cat $APPDIR/version.txt` if [[ -z "$GITVER" ]]; then diff --git a/.github/workflows/appimage.sh b/.github/workflows/appimage.sh index 3d88d4fc2..57e7c6cba 100644 --- a/.github/workflows/appimage.sh +++ b/.github/workflows/appimage.sh @@ -36,7 +36,8 @@ chmod a+x ./squashfs-root/runtime chmod a+x ./squashfs-root/update.sh #cp /tmp/libssl.so.47 /tmp/libcrypto.so.45 /usr/lib/x86_64-linux-gnu/ -echo $GITHUB_SHA > $HOME/squashfs-root/version.txt +version=$(cat /yuzu/README.md | grep -o 'early-access [[:digit:]]*' | cut -c 14-17) +echo EA-$version > $HOME/squashfs-root/version.txt unset QT_PLUGIN_PATH unset LD_LIBRARY_PATH @@ -55,7 +56,6 @@ export PATH=$(readlink -f /tmp/squashfs-root/usr/bin/):$PATH mkdir $HOME/squashfs-root/dist/ cp /yuzu/dist/yuzu.ico $HOME/squashfs-root/dist/ /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 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8851b81e8..3e071e50b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,8 +38,8 @@ jobs: wget -c https://github.com/tcnksm/ghr/releases/download/v0.13.0/ghr_v0.13.0_linux_amd64.tar.gz tar xfv ghr_v0.13.0_linux_amd64.tar.gz version=$(ls artifacts/version |grep Yuzu-EA | cut -d "-" -f 3 | cut -d "." -f 1) - ghr_v0.13.0_linux_amd64/ghr -recreate -n 'Continuous build' -b "GitHub https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" continuous artifacts/ - ghr_v0.13.0_linux_amd64/ghr -replace -n "EA-$version" -b "GitHub https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" EA-$version artifacts/version/ + ghr_v0.13.0_linux_amd64/ghr -replace -n 'Continuous build' -b "Yuzu build with Auto-Updater builtin" continuous artifacts/ + ghr_v0.13.0_linux_amd64/ghr -replace -n "EA-$version" -b "early-access version $version" EA-$version artifacts/version/ env: DEFAULT_BRANCH: main