From c0b564e160bad31028a7e7c85acb5201d0bd14ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Tue, 24 Oct 2023 12:23:29 +0200 Subject: [PATCH] fix(ci): pin linuxdeployqt at 20230423 (8428c59) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Using continuous builds is a great way to get unexpected results. Signed-off-by: Jakub Sokołowski --- ci/Dockerfile | 4 ++-- scripts/ubuntu_build_setup.sh | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ci/Dockerfile b/ci/Dockerfile index 8ac2bbc12e..465d5a74e6 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -19,7 +19,7 @@ RUN python3 -m pip install setuptools \ # Build Image ------------------------------------------------------------------ FROM ubuntu:20.04 -ARG LINUXDEPLOYQT_VERSION=continuous +ARG LINUXDEPLOYQT_VERSION=20230423-8428c59 ARG QT_VERSION # Adapted from a12e/docker-qt by Aurélien Brooke @@ -58,7 +58,7 @@ RUN apt update -yq && apt install -yq software-properties-common \ # Install linuxdeployqt RUN mkdir -p /usr/local/bin \ - && curl -Lo/usr/local/bin/linuxdeployqt "https://github.com/probonopd/linuxdeployqt/releases/download/$LINUXDEPLOYQT_VERSION/linuxdeployqt-$LINUXDEPLOYQT_VERSION-x86_64.AppImage" \ + && curl -Lo/usr/local/bin/linuxdeployqt "https://status-misc.ams3.digitaloceanspaces.com/desktop/linuxdeployqt-${LINUXDEPLOYQT_VERSION}-x86_64.AppImage" \ && chmod a+x /usr/local/bin/linuxdeployqt # Reconfigure locale diff --git a/scripts/ubuntu_build_setup.sh b/scripts/ubuntu_build_setup.sh index a8ffc3fa3f..712ec1b06d 100755 --- a/scripts/ubuntu_build_setup.sh +++ b/scripts/ubuntu_build_setup.sh @@ -26,7 +26,9 @@ function install_build_dependencies { function install_release_dependencies { echo "Install release dependencies" mkdir -p /usr/local/bin - curl -Lo/usr/local/bin/linuxdeployqt "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" + LINUXDEPLOYQT='linuxdeployqt-20230423-8428c59-x86_64.AppImage' + curl -L "https://status-misc.ams3.digitaloceanspaces.com/desktop/${LINUXDEPLOYQT}" + -o /usr/local/bin/linuxdeployqt chmod a+x /usr/local/bin/linuxdeployqt apt install -yq gstreamer1.0-plugins-good gstreamer1.0-plugins-bad \