From ccddb4456b595901cab83813c5ce86016ba62b4a Mon Sep 17 00:00:00 2001
From: Albert Liu <45282415+ggrtk@users.noreply.github.com>
Date: Mon, 13 Apr 2020 21:36:39 -0700
Subject: [PATCH] CI: Use AppImage generation script for Linux build
---
appveyor.yml | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/appveyor.yml b/appveyor.yml
index 31f169005..d9dd7e694 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -54,25 +54,23 @@ build_script:
ninja
- wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
+ ../appimage/generate-appimages.sh $(pwd)
- wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage
+ if [ $? -eq 0 ]; then
- chmod +x linuxdeploy-x86_64.AppImage
+ mv duckstation-qt-x64.AppImage duckstation-qt-x64-release.AppImage
- chmod +x linuxdeploy-plugin-qt-x86_64.AppImage
+ mv duckstation-sdl-x64.AppImage duckstation-sdl-x64-release.AppImage
- cp ../appimage/duckstation-icon.png ../appimage/duckstation-qt.png
+ 7za a -r duckstation-linux-x64-release.7z duckstation-*.AppImage
- cp ../appimage/duckstation-icon.png ../appimage/duckstation-sdl.png
+ appveyor PushArtifact duckstation-linux-x64-release.7z
- ./linuxdeploy-x86_64.AppImage --appdir=./AppDir-duckstation-qt --executable=./src/duckstation-qt/duckstation-qt --create-desktop-file --icon-file=../appimage/duckstation-qt.png --plugin=qt --output=appimage
+ else
- ./linuxdeploy-x86_64.AppImage --appdir=./AppDir-duckstation-sdl --executable=./src/duckstation-sdl/duckstation-sdl --create-desktop-file --icon-file=../appimage/duckstation-sdl.png --output=appimage
+ echo "Failed to create AppImages, no AppImage artifact will be pushed"
- 7za a -r duckstation-linux-x64-release.7z duckstation-*.AppImage
-
- appveyor PushArtifact duckstation-linux-x64-release.7z
+ fi
elif [ "$APPVEYOR_BUILD_WORKER_IMAGE" == "macOS" ]; then