Skip to content

Update to Qt 6.7 #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 31, 2024
Merged

Update to Qt 6.7 #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d0c26a9
Update to Qt 6.7
adazem009 Apr 6, 2024
716d8fa
Use install-qt-action v4
adazem009 Aug 21, 2024
0906b5a
Use linux_gcc_64 arch when installing Qt
adazem009 Aug 21, 2024
e8c1538
Copy missing libraries when deploying for Windows
adazem009 Aug 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/linux-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
qt-version: ['6.6']
qt-version: ['6.7']
qt-target: ['desktop']
qt-modules: ['']
arch: ['amd64']
Expand All @@ -37,10 +37,11 @@ jobs:
## Install Qt
- if: contains(matrix.arch, 'amd64')
name: Install Qt (Ubuntu)
uses: jurplel/install-qt-action@v3
uses: jurplel/install-qt-action@v4
with:
version: ${{ matrix.qt-version }}
host: 'linux'
arch: 'linux_gcc_64'
target: ${{ matrix.qt-target }}
modules: ${{ matrix.qt-modules }}
- if: "!contains(matrix.arch, 'amd64')"
Expand Down
15 changes: 11 additions & 4 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
qt-version: ['6.6']
qt-version: ['6.7']
qt-target: ['desktop']
qt-modules: ['']
arch: ['amd64']
Expand Down Expand Up @@ -48,10 +48,11 @@ jobs:
# Install Qt
- if: contains(matrix.arch, 'amd64')
name: Install Qt
uses: jurplel/install-qt-action@v3
uses: jurplel/install-qt-action@v4
with:
version: ${{ matrix.qt-version }}
host: 'linux'
arch: 'linux_gcc_64'
target: ${{ matrix.qt-target }}
modules: ${{ matrix.qt-modules }}
- if: "!contains(matrix.arch, 'amd64')"
Expand Down Expand Up @@ -91,7 +92,7 @@ jobs:
runs-on: windows-latest
strategy:
matrix:
qt-version: ['6.6']
qt-version: ['6.7']
qt-target: ['desktop']
qt-modules: ['']
mingw-version: ['11.2.0']
Expand Down Expand Up @@ -123,7 +124,7 @@ jobs:
shell: bash
# Install Qt
- name: Install Qt
uses: jurplel/install-qt-action@v3
uses: jurplel/install-qt-action@v4
with:
version: ${{ matrix.qt-version }}
host: 'windows'
Expand Down Expand Up @@ -155,6 +156,12 @@ jobs:
cd win_release
windeployqt ${{ env.executable_name }}.exe --qmldir ..\win_build\src || exit 5
shell: cmd
- name: Copy libraries
run: |
cp ${QT_ROOT_DIR}/bin/libgcc_s_seh-1.dll win_release/
cp ${QT_ROOT_DIR}/bin/libstdc++-6.dll win_release/
cp ${QT_ROOT_DIR}/bin/libwinpthread-1.dll win_release/
shell: bash
# Update Windows repository
- if: env.create_windows_installer == 1 && env.is_prerelease == 1
name: Do not update Windows repo if this is a pre-release
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/utests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@ jobs:
sudo apt-get install -y nlohmann-json3-dev libutfcpp-dev xvfb libxcb-cursor0
shell: bash
- name: Install Qt
uses: jurplel/install-qt-action@v3
uses: jurplel/install-qt-action@v4
with:
version: '6.6.*'
version: '6.7.*'
arch: 'linux_gcc_64'
- name: Configure CMake
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DSCRATCHCPP_PLAYER_BUILD_UNIT_TESTS=ON

Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/windows-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: windows-latest
strategy:
matrix:
qt-version: ['6.6']
qt-version: ['6.7']
qt-target: ['desktop']
qt-modules: ['']
mingw-version: ['11.2.0']
Expand All @@ -35,7 +35,7 @@ jobs:
shell: bash
## Install Qt
- name: Install Qt
uses: jurplel/install-qt-action@v3
uses: jurplel/install-qt-action@v4
with:
version: ${{ matrix.qt-version }}
host: 'windows'
Expand Down Expand Up @@ -67,6 +67,12 @@ jobs:
cd win_release
windeployqt ${{ env.executable_name }}.exe --qmldir ..\win_build\src || exit 5
shell: cmd
- name: Copy libraries
run: |
cp ${QT_ROOT_DIR}/bin/libgcc_s_seh-1.dll win_release/
cp ${QT_ROOT_DIR}/bin/libstdc++-6.dll win_release/
cp ${QT_ROOT_DIR}/bin/libwinpthread-1.dll win_release/
shell: bash
## Upload
- name: Upload artifacts
uses: actions/upload-artifact@v3
Expand Down
Loading