Skip to content

Commit

Permalink
Update Qt version to 6.7.3 in CI workflows and build scripts
Browse files Browse the repository at this point in the history
Signed-off-by: xiaoming <2014500726@smail.xtu.edu.cn>
  • Loading branch information
QQxiaoming committed Dec 30, 2024
1 parent 91542ba commit 6462f46
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v4
with:
version: '6.8.1'
version: '6.7.3'
modules: 'qtwebsockets qtserialport qtmultimedia'
aqtversion: '==3.1.20'

Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
run: |
git fetch --tags --force
sed -i 's/--long --dirty/--long/g' ./tools/generate_info.sh
sed -i 's/QT_DIR=\/opt\/Qt6.2.0\/6.2.0\/gcc_64/QT_DIR=$(cd "$(dirname "$0")";pwd)\/..\/Qt\/6.8.1\/gcc_64/g' build_deb.sh
sed -i 's/QT_DIR=\/opt\/Qt6.2.0\/6.2.0\/gcc_64/QT_DIR=$(cd "$(dirname "$0")";pwd)\/..\/Qt\/6.7.3\/gcc_64/g' build_deb.sh
sed -i 's/LIBSSH2_DIR=\/libssh2/LIBSSH2_DIR=\/usr\/local\/output/g' ./lib/qtssh/qtssh.pri
mkdir prebuilt_plugins
python3 ./.github/scripts/get_plugin.py ./.github/scripts/plugin_list.json ./prebuilt_plugins
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linux_appimage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v4
with:
version: '6.8.1'
version: '6.7.3'
modules: 'qtwebsockets qtserialport qtmultimedia'
aqtversion: '==3.1.20'

Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
run: |
git fetch --tags --force
sed -i 's/--long --dirty/--long/g' ./tools/generate_info.sh
sed -i 's/QT_DIR=\/opt\/Qt6.2.0\/6.2.0\/gcc_64/QT_DIR=$(cd "$(dirname "$0")";pwd)\/..\/Qt\/6.8.1\/gcc_64/g' build_AppImage.sh
sed -i 's/QT_DIR=\/opt\/Qt6.2.0\/6.2.0\/gcc_64/QT_DIR=$(cd "$(dirname "$0")";pwd)\/..\/Qt\/6.7.3\/gcc_64/g' build_AppImage.sh
sed -i 's/LIBSSH2_DIR=\/libssh2/LIBSSH2_DIR=\/usr\/local\/output/g' ./lib/qtssh/qtssh.pri
mkdir prebuilt_plugins
python3 ./.github/scripts/get_plugin.py ./.github/scripts/plugin_list.json ./prebuilt_plugins
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
uses: jurplel/install-qt-action@v4
with:
arch: win64_mingw
version: '6.8.1'
version: '6.7.3'
modules: 'qtwebsockets qtserialport qtmultimedia'
aqtversion: '==3.1.19'
tools: 'tools_mingw1310'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows_msvc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
uses: jurplel/install-qt-action@v4
with:
arch: 'win64_msvc2022_64'
version: '6.8.1'
version: '6.7.3'
modules: 'qtwebsockets qtserialport qtmultimedia'
aqtversion: '==3.1.19'

Expand Down
4 changes: 2 additions & 2 deletions depend/build_fcitx_qt6_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ set -e

# ubuntu20.04 need install
# sudo apt install fcitx-libs-dev qtbase5-private-dev libxkbcommon-dev extra-cmake-modules
# export PATH="~/Qt/6.8.1/gcc_64/bin":$PATH
# export PATH="~/Qt/6.7.3/gcc_64/bin":$PATH
# export PATH="~/Qt/Tools/CMake/bin":$PATH
# export Qt6GuiTools_DIR=/home/qqm/Qt/6.8.1/gcc_64
# export Qt6GuiTools_DIR=/home/qqm/Qt/6.7.3/gcc_64
SHELL_FOLDER=$(cd "$(dirname "$0")";pwd)
tar -xzvf fcitx-qt5-1.2.7.tar.gz
cd $SHELL_FOLDER/fcitx-qt5-1.2.7
Expand Down

0 comments on commit 6462f46

Please sign in to comment.