From dc53a3ba42107afff4968e235eeb7e5e90749970 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Fri, 10 Oct 2025 10:00:06 +0200 Subject: [PATCH] Update linux docker image to v.1.7 --- .ci/deploy-linux.sh | 2 +- .github/workflows/rpcs3.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.ci/deploy-linux.sh b/.ci/deploy-linux.sh index f8c3d849c3..fe6174fc78 100755 --- a/.ci/deploy-linux.sh +++ b/.ci/deploy-linux.sh @@ -14,7 +14,7 @@ if [ "$DEPLOY_APPIMAGE" = "true" ]; then curl -fsSLo linuxdeploy-plugin-checkrt.sh https://github.com/darealshinji/linuxdeploy-plugin-checkrt/releases/download/continuous/linuxdeploy-plugin-checkrt.sh chmod +x ./linuxdeploy-plugin-checkrt.sh - export EXTRA_PLATFORM_PLUGINS="libqwayland-egl.so;libqwayland-generic.so" + export EXTRA_PLATFORM_PLUGINS="libqwayland.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 --plugin checkrt diff --git a/.github/workflows/rpcs3.yml b/.github/workflows/rpcs3.yml index 0d40d01437..dd9c6ea736 100644 --- a/.github/workflows/rpcs3.yml +++ b/.github/workflows/rpcs3.yml @@ -30,23 +30,23 @@ jobs: matrix: include: - os: ubuntu-24.04 - docker_img: "rpcs3/rpcs3-ci-jammy:1.6" + docker_img: "rpcs3/rpcs3-ci-jammy:1.7" build_sh: "/rpcs3/.ci/build-linux.sh" compiler: clang UPLOAD_COMMIT_HASH: d812f1254a1157c80fd402f94446310560f54e5f UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-linux" - os: ubuntu-24.04 - docker_img: "rpcs3/rpcs3-ci-jammy:1.6" + docker_img: "rpcs3/rpcs3-ci-jammy:1.7" build_sh: "/rpcs3/.ci/build-linux.sh" compiler: gcc - os: ubuntu-24.04-arm - docker_img: "rpcs3/rpcs3-ci-jammy-aarch64:1.6" + docker_img: "rpcs3/rpcs3-ci-jammy-aarch64:1.7" build_sh: "/rpcs3/.ci/build-linux-aarch64.sh" compiler: clang UPLOAD_COMMIT_HASH: a1d35836e8d45bfc6f63c26f0a3e5d46ef622fe1 UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-linux-arm64" - os: ubuntu-24.04-arm - docker_img: "rpcs3/rpcs3-ci-jammy-aarch64:1.6" + docker_img: "rpcs3/rpcs3-ci-jammy-aarch64:1.7" build_sh: "/rpcs3/.ci/build-linux-aarch64.sh" compiler: gcc name: RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }}