From 1b6566a813e0538748405a9e62f31ca33d9f1352 Mon Sep 17 00:00:00 2001 From: Gonzalo Exequiel Pedone Date: Mon, 25 Mar 2024 13:56:08 -0300 Subject: [PATCH] Updated QtIFW. --- .github/workflows/linux.yml | 2 +- ports/ci/linux/install_deps.sh | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index dedf2ff..0c15945 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -3,7 +3,7 @@ name: Linux Ubuntu on: [push, pull_request] env: - QTIFWVER: 4.6.1 + QTIFWVER: 4.7.0 jobs: build: diff --git a/ports/ci/linux/install_deps.sh b/ports/ci/linux/install_deps.sh index b344afe..f89e28d 100644 --- a/ports/ci/linux/install_deps.sh +++ b/ports/ci/linux/install_deps.sh @@ -68,11 +68,17 @@ mkdir -p .local/bin architecture="${DOCKERIMG%%/*}" -if [ "${architecture}" = amd64 ]; then - # Install Qt Installer Framework +# Install Qt Installer Framework - qtIFW=QtInstallerFramework-linux-x64-${QTIFWVER}.run - ${DOWNLOAD_CMD} "http://download.qt.io/official_releases/qt-installer-framework/${QTIFWVER}/${qtIFW}" || true +if [[ "${architecture}" = amd64 || "${architecture}" = arm64v8 ]]; then + if [ "${architecture}" = amd64 ]; then + ifwArch=x64 + else + ifwArch=arm64 + fi + + qtIFW=QtInstallerFramework-linux-${ifwArch}-${QTIFWVER}.run + ${DOWNLOAD_CMD} "https://download.qt.io/official_releases/qt-installer-framework/${QTIFWVER}/${qtIFW}" || true if [ -e "${qtIFW}" ]; then chmod +x "${qtIFW}"