From 42b255a4a24ecf4f1454d28c77b04a799a8d187b Mon Sep 17 00:00:00 2001 From: Zion Nimchuk Date: Thu, 3 Oct 2024 10:23:56 -0700 Subject: [PATCH] Fix checkrt bundling and remove legacy deploy script --- .ci/build-linux.sh | 2 +- .ci/deploy-linux-legacy.sh | 48 -------------------------------------- .ci/deploy-linux.sh | 4 +--- 3 files changed, 2 insertions(+), 52 deletions(-) delete mode 100755 .ci/deploy-linux-legacy.sh diff --git a/.ci/build-linux.sh b/.ci/build-linux.sh index 35aabf85d9..7e594b1c5e 100755 --- a/.ci/build-linux.sh +++ b/.ci/build-linux.sh @@ -61,5 +61,5 @@ shellcheck .ci/*.sh } && SHOULD_DEPLOY="true" || SHOULD_DEPLOY="false" if [ "$build_status" -eq 0 ] && [ "$SHOULD_DEPLOY" = "true" ]; then - .ci/deploy-linux-legacy.sh "x86_64" + .ci/deploy-linux.sh "x86_64" fi diff --git a/.ci/deploy-linux-legacy.sh b/.ci/deploy-linux-legacy.sh deleted file mode 100755 index 1e22c5ffc9..0000000000 --- a/.ci/deploy-linux-legacy.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -ex - -cd build || exit 1 - -if [ "$DEPLOY_APPIMAGE" = "true" ]; then - DESTDIR=AppDir ninja install - - curl -fsSLo /usr/bin/linuxdeploy https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage - chmod +x /usr/bin/linuxdeploy - curl -fsSLo /usr/bin/linuxdeploy-plugin-qt https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage - chmod +x /usr/bin/linuxdeploy-plugin-qt - curl -fsSLo linuxdeploy-plugin-checkrt.sh https://github.com/linuxdeploy/linuxdeploy-plugin-checkrt/releases/download/continuous/linuxdeploy-plugin-checkrt-x86_64.sh - chmod +x ./linuxdeploy-plugin-checkrt.sh - - export EXTRA_PLATFORM_PLUGINS="libqwayland-egl.so;libqwayland-generic.so" - export EXTRA_QT_PLUGINS="svg;wayland-decoration-client;wayland-graphics-integration-client;wayland-shell-integration" - APPIMAGE_EXTRACT_AND_RUN=1 linuxdeploy --appdir AppDir --plugin qt - - # Remove libwayland-client because it has platform-dependent exports and breaks other OSes - rm -f ./AppDir/usr/lib/libwayland-client.so* - - # Remove libvulkan because it causes issues with gamescope - rm -f ./AppDir/usr/lib/libvulkan.so* - - # Remove git directory containing local commit history file - rm -rf ./AppDir/usr/share/rpcs3/git - - ./linuxdeploy-plugin-checkrt.sh --appdir AppDir - - linuxdeploy --appimage-extract - ./squashfs-root/plugins/linuxdeploy-plugin-appimage/usr/bin/appimagetool AppDir -g - - COMM_TAG=$(awk '/version{.*}/ { printf("%d.%d.%d", $5, $6, $7) }' ../rpcs3/rpcs3_version.cpp) - COMM_COUNT="$(git rev-list --count HEAD)" - COMM_HASH="$(git rev-parse --short=8 HEAD)" - RPCS3_APPIMAGE="rpcs3-v${COMM_TAG}-${COMM_COUNT}-${COMM_HASH}_linux64.AppImage" - - mv ./RPCS3*.AppImage "$RPCS3_APPIMAGE" - - # If we're building using a CI, let's copy over the AppImage artifact - if [ -n "$BUILD_ARTIFACTSTAGINGDIRECTORY" ]; then - cp "$RPCS3_APPIMAGE" "$ARTDIR" - fi - - FILESIZE=$(stat -c %s ./rpcs3*.AppImage) - SHA256SUM=$(sha256sum ./rpcs3*.AppImage | awk '{ print $1 }') - echo "${SHA256SUM};${FILESIZE}B" > "$RELEASE_MESSAGE" -fi diff --git a/.ci/deploy-linux.sh b/.ci/deploy-linux.sh index df5950061c..38a1d3e05c 100755 --- a/.ci/deploy-linux.sh +++ b/.ci/deploy-linux.sh @@ -17,7 +17,7 @@ if [ "$DEPLOY_APPIMAGE" = "true" ]; then export EXTRA_PLATFORM_PLUGINS="libqwayland-egl.so;libqwayland-generic.so" export EXTRA_QT_PLUGINS="svg;wayland-decoration-client;wayland-graphics-integration-client;wayland-shell-integration;waylandcompositor" - APPIMAGE_EXTRACT_AND_RUN=1 linuxdeploy --appdir AppDir --plugin qt + APPIMAGE_EXTRACT_AND_RUN=1 linuxdeploy --appdir AppDir --plugin qt --plugin checkrt # Remove libwayland-client because it has platform-dependent exports and breaks other OSes rm -f ./AppDir/usr/lib/libwayland-client.so* @@ -28,8 +28,6 @@ if [ "$DEPLOY_APPIMAGE" = "true" ]; then # Remove git directory containing local commit history file rm -rf ./AppDir/usr/share/rpcs3/git - ./linuxdeploy-plugin-checkrt.sh --appdir AppDir - linuxdeploy --appimage-extract ./squashfs-root/plugins/linuxdeploy-plugin-appimage/usr/bin/appimagetool AppDir -g