-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update Qt versions in GitHub workflows and project configuration files
Signed-off-by: xiaoming <[email protected]>
- Loading branch information
1 parent
71d745d
commit 81a37be
Showing
9 changed files
with
36 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -31,7 +31,8 @@ jobs: | |
- name: Install Qt | ||
uses: jurplel/[email protected] | ||
with: | ||
version: '6.2.0' | ||
version: '6.5.3' | ||
aqtversion: ==3.1.7 | ||
|
||
- name: Setup OpenCV | ||
uses: Dovyski/[email protected] | ||
|
@@ -44,7 +45,7 @@ jobs: | |
- name: Install prerequisites | ||
run: | | ||
sudo apt update | ||
sudo apt install -y make gcc patchelf chrpath qt5-default | ||
sudo apt install -y make gcc patchelf chrpath qt5-default libxcb-cursor0 build-essential libgtk-3-dev | ||
- name: Build all | ||
run: | | ||
|
@@ -56,7 +57,7 @@ jobs: | |
./build_deb.sh | ||
- name: Upload build asserts | ||
uses: actions/[email protected].0 | ||
uses: actions/[email protected].1 | ||
with: | ||
name: YUVviewer_Ubuntu2004 | ||
path: | | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -31,7 +31,8 @@ jobs: | |
- name: Install Qt | ||
uses: jurplel/[email protected] | ||
with: | ||
version: '6.2.0' | ||
version: '6.5.3' | ||
aqtversion: ==3.1.7 | ||
|
||
- name: Install prerequisites | ||
shell: bash -l {0} | ||
|
@@ -52,13 +53,13 @@ jobs: | |
run: | | ||
git fetch --tags --force | ||
sed -i'.original' -e 's/--long --dirty/--long/g' ./tools/generate_info.sh | ||
sed -i'.original' -e 's/QT_DIR=\/opt\/Qt6.2.0\/6.2.0\/gcc_64/QT_DIR=$(cd "$(dirname "$0")";pwd)\/..\/Qt\/6.2.0\/macos/g' build_dmg.sh | ||
sed -i'.original' -e 's/QT_DIR=\/opt\/Qt6.2.0\/6.2.0\/gcc_64/QT_DIR=$(cd "$(dirname "$0")";pwd)\/..\/Qt\/6.5.3\/macos/g' build_dmg.sh | ||
sed -i'.original' -e 's/\/home\/xiaoming\/Desktop\/opencv/\/usr\/local/g' build_dmg.sh | ||
sed -i'.original' -e 's/\/home\/xiaoming\/Desktop\/opencv/\/usr\/local/g' partform_unix.pri | ||
./build_dmg.sh | ||
- name: Upload build asserts | ||
uses: actions/[email protected].0 | ||
uses: actions/[email protected].1 | ||
with: | ||
name: YUVviewer_macos | ||
path: | | ||
|
@@ -78,7 +79,8 @@ jobs: | |
- name: Install Qt | ||
uses: jurplel/[email protected] | ||
with: | ||
version: '6.2.0' | ||
version: '6.5.3' | ||
aqtversion: ==3.1.7 | ||
|
||
- name: Install prerequisites | ||
shell: bash -l {0} | ||
|
@@ -99,15 +101,15 @@ jobs: | |
run: | | ||
git fetch --tags --force | ||
sed -i'.original' -e 's/--long --dirty/--long/g' ./tools/generate_info.sh | ||
sed -i'.original' -e 's/QT_DIR=\/opt\/Qt6.2.0\/6.2.0\/gcc_64/QT_DIR=$(cd "$(dirname "$0")";pwd)\/..\/Qt\/6.2.0\/macos/g' build_dmg.sh | ||
sed -i'.original' -e 's/QT_DIR=\/opt\/Qt6.2.0\/6.2.0\/gcc_64/QT_DIR=$(cd "$(dirname "$0")";pwd)\/..\/Qt\/6.5.3\/macos/g' build_dmg.sh | ||
sed -i'.original' -e 's/\/home\/xiaoming\/Desktop\/opencv/\/usr\/local/g' build_dmg.sh | ||
sed -i'.original' -e 's/\/home\/xiaoming\/Desktop\/opencv/\/usr\/local/g' partform_unix.pri | ||
./build_dmg.sh | ||
- name: Upload build asserts | ||
uses: actions/[email protected].0 | ||
uses: actions/[email protected].1 | ||
with: | ||
name: YUVviewer_macos | ||
name: YUVviewer_macos_arm64 | ||
path: | | ||
./build_release/out/YUVviewer.dmg | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -31,8 +31,9 @@ jobs: | |
- name: Install Qt | ||
uses: jurplel/[email protected] | ||
with: | ||
arch: win64_mingw81 | ||
version: '6.2.0' | ||
arch: win64_mingw | ||
version: '6.5.3' | ||
aqtversion: ==3.1.7 | ||
|
||
- name: Cache opencv | ||
uses: actions/cache@v4 | ||
|
@@ -79,10 +80,11 @@ jobs: | |
./tools/sed/sed.exe -i "s/libopencv_imgcodecs420/libopencv_imgcodecs400/g" ./build_setup.bat | ||
./tools/sed/sed.exe -i "s/libopencv_core420/libopencv_core400/g" ./build_setup.bat | ||
./tools/sed/sed.exe -i "s/OPENCV_DIR=D:\\Qt\\opencv4.2.0/OPENCV_DIR=C:\\opencv4.0.0/g" ./partform_win32.pri | ||
c:/Windows/system32/WindowsPowerShell/v1.0/powershell.exe -ExecutionPolicy Bypass -NoLogo -NoProfile -File "./tools/generate_info.ps1" > ./build_info.inc | ||
./build_setup.bat | ||
- name: Upload build asserts | ||
uses: actions/[email protected].0 | ||
uses: actions/[email protected].1 | ||
with: | ||
name: YUVviewer_windows | ||
path: | | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.