From 4a31c9d1912f6fba9fa22fb4d1f4adf6467762fd Mon Sep 17 00:00:00 2001 From: Ake Hedman Date: Tue, 14 Jan 2025 22:37:03 +0100 Subject: [PATCH] test action --- .github/workflows/appimage.yml | 4 ++-- install/setenv.sh | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 2f4af98c..2ad4e2d5 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -50,11 +50,11 @@ jobs: # - name: Install mysql client # run: sudo apt install libmysqlclient-dev - # https://github.com/marketplace/actions/install-qt 6.5.3 + # https://github.com/marketplace/actions/install-qt - name: Install Qt uses: jurplel/install-qt-action@v4 with: - version: 6.7.3 + version: 6.5.3 host: 'linux' target: 'desktop' arch: 'gcc_64' diff --git a/install/setenv.sh b/install/setenv.sh index cefe59f5..b70aaedd 100644 --- a/install/setenv.sh +++ b/install/setenv.sh @@ -1,16 +1,16 @@ #!/bin/bash -QT_BASE_DIR=/opt/qt515 +QT_BASE_DIR=~/Qt/6.8.1/ export QTDIR=$QT_BASE_DIR export PATH=$QT_BASE_DIR/bin:$PATH if [[ $(uname -m) == "x86_64" ]]; then - export LD_LIBRARY_PATH=$QT_BASE_DIR/lib/x86_64-linux-gnu:$QT_BASE_DIR/lib:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH=$QT_BASE_DIR/gcc_64/lib/:$QT_BASE_DIR/:$LD_LIBRARY_PATH else export LD_LIBRARY_PATH=$QT_BASE_DIR/lib/i386-linux-gnu:$QT_BASE_DIR/lib:$LD_LIBRARY_PATH fi -export PKG_CONFIG_PATH=$QT_BASE_DIR/lib/pkgconfig:$PKG_CONFIG_PATH +export PKG_CONFIG_PATH=$QT_BASE_DIR/gcc_64/lib/pkgconfig:$PKG_CONFIG_PATH TEST=`echo $0 | grep wrapper` if [ "$TEST" != "" ]; then