diff options
| author | 2022-07-31 00:07:30 -0400 | |
|---|---|---|
| committer | 2022-07-31 03:25:29 -0400 | |
| commit | d77fe3b1c2990e97a5c8f3f5f76476f44b8892b0 (patch) | |
| tree | ecc9a2b9f3aa7b6e77d538a18d5c8d16da4002f1 | |
| parent | patreon step2: Enable Linux build (diff) | |
| download | yuzu-d77fe3b1c2990e97a5c8f3f5f76476f44b8892b0.tar.gz yuzu-d77fe3b1c2990e97a5c8f3f5f76476f44b8892b0.tar.xz yuzu-d77fe3b1c2990e97a5c8f3f5f76476f44b8892b0.zip | |
ci/linux: EA AppImage adjustments
Prevent AppImageLauncher from trying to integrate our AppImage on end
user systems. Don't include the basic yuzu executable with EA or
Mainline.
| -rwxr-xr-x | .ci/scripts/linux/upload.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/.ci/scripts/linux/upload.sh b/.ci/scripts/linux/upload.sh index 155edf25b..e0f336427 100755 --- a/.ci/scripts/linux/upload.sh +++ b/.ci/scripts/linux/upload.sh | |||
| @@ -20,7 +20,9 @@ fi | |||
| 20 | mkdir "$DIR_NAME" | 20 | mkdir "$DIR_NAME" |
| 21 | 21 | ||
| 22 | cp build/bin/yuzu-cmd "$DIR_NAME" | 22 | cp build/bin/yuzu-cmd "$DIR_NAME" |
| 23 | cp build/bin/yuzu "$DIR_NAME" | 23 | if [ "${RELEASE_NAME}" != "early-access" ] && [ "${RELEASE_NAME}" != "mainline" ]; then |
| 24 | cp build/bin/yuzu "$DIR_NAME" | ||
| 25 | fi | ||
| 24 | 26 | ||
| 25 | # Build an AppImage | 27 | # Build an AppImage |
| 26 | cd build | 28 | cd build |
| @@ -33,6 +35,11 @@ if ! ./appimagetool-x86_64.AppImage --version; then | |||
| 33 | export APPIMAGE_EXTRACT_AND_RUN=1 | 35 | export APPIMAGE_EXTRACT_AND_RUN=1 |
| 34 | fi | 36 | fi |
| 35 | 37 | ||
| 38 | # Don't let AppImageLauncher ask to integrate EA | ||
| 39 | if [ "${RELEASE_NAME}" = "mainline" ] || [ "${RELEASE_NAME}" = "early-access" ]; then | ||
| 40 | echo "X-AppImage-Integrate=false" >> AppDir/org.yuzu_emu.yuzu.desktop | ||
| 41 | fi | ||
| 42 | |||
| 36 | if [ "${RELEASE_NAME}" = "mainline" ]; then | 43 | if [ "${RELEASE_NAME}" = "mainline" ]; then |
| 37 | # Generate update information if releasing to mainline | 44 | # Generate update information if releasing to mainline |
| 38 | ./appimagetool-x86_64.AppImage -u "gh-releases-zsync|yuzu-emu|yuzu-${RELEASE_NAME}|latest|yuzu-*.AppImage.zsync" AppDir "${APPIMAGE_NAME}" | 45 | ./appimagetool-x86_64.AppImage -u "gh-releases-zsync|yuzu-emu|yuzu-${RELEASE_NAME}|latest|yuzu-*.AppImage.zsync" AppDir "${APPIMAGE_NAME}" |