Skip to content

Commit

Permalink
Use QtIFw 4.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
iakov committed Mar 17, 2024
1 parent 066da16 commit 5dd3445
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Expand Up @@ -110,8 +110,8 @@ jobs:
- name: Install proper version for QtIfw
run: |
cd "$RUNNER_TEMP"
curl -Lo qtifw.exe "https://download.qt.io/official_releases/qt-installer-framework/4.2.0/QtInstallerFramework-windows-x86-4.2.0.exe"
export TRIK_QT_INSTALL_DIR="${IQTA_TOOLS}/QtInstallerFramework/4.2.0"
curl -Lo qtifw.exe "https://download.qt.io/official_releases/qt-installer-framework/4.6.1/QtInstallerFramework-windows-x86-4.6.1.exe"
export TRIK_QT_INSTALL_DIR="${IQTA_TOOLS}/QtInstallerFramework/4.6.1"
mkdir -p $TRIK_QT_INSTALL_DIR
"$RUNNER_TEMP"/qtifw.exe --verbose --no-force-installations --show-virtual-components --script "${GITHUB_WORKSPACE}\\plugins\\robots\\thirdparty\\trikRuntime\\trikRuntime\\docker\\qt_scriptinstall.qs"
rm -rf "$TRIK_QT_INSTALL_DIR"/{doc,examples,Uninstaller.app,Uninstaller.dat}
Expand Down Expand Up @@ -201,7 +201,7 @@ jobs:
- name: Build installer
run: |
cd $GITHUB_WORKSPACE/installer
./build-trik-studio.sh "${Qt5_Dir}/bin" "${IQTA_TOOLS}/QtInstallerFramework/4.2.0/bin" "${{ env.BUILD_DIR }}"
./build-trik-studio.sh "${Qt5_Dir}/bin" "${IQTA_TOOLS}/QtInstallerFramework/4.6.1/bin" "${{ env.BUILD_DIR }}"
- name: Push installer
uses: actions/upload-artifact@v2
Expand Down
2 changes: 1 addition & 1 deletion buildScripts/azure/install_qtifw_mac.sh
Expand Up @@ -3,7 +3,7 @@ TRIK_QT_INSTALL_DIR=${TRIK_QT_INSTALL_DIR:-$HOME/TRIK_QtIfw}
SCRIPT_DIR=$(dirname ${BASH_SOURCE[0]})
set -ueo pipefail
#The latest with Qt 5.12 as minimal required, 4.3.0 requires Qt 5.15
QTIFW_VERSION=4.2.0
QTIFW_VERSION=4.6.1
D=/tmp/qtifw-installer.dmg
test -r "$D" || curl -L -o "$D" "http://download.qt-project.org/official_releases/qt-installer-framework/$QTIFW_VERSION/QtInstallerFramework-macOS-x64-4.2.0.dmg"
P=$(hdiutil attach "$D" -noverify -noautofsck | grep -o '/Volumes/.*$')
Expand Down

0 comments on commit 5dd3445

Please sign in to comment.