Revert "Temporarily revert Windows ARM64 to Qt 6.10.0"
This reverts commit 6313129603.
This commit is contained in:
parent
9d597a666b
commit
eb294e63f4
1 changed files with 2 additions and 3 deletions
5
.github/workflows/build-win-mac.yml
vendored
5
.github/workflows/build-win-mac.yml
vendored
|
|
@ -21,7 +21,6 @@ jobs:
|
||||||
# Windows
|
# Windows
|
||||||
- os: windows-2025
|
- os: windows-2025
|
||||||
qt_version: 6.10.1
|
qt_version: 6.10.1
|
||||||
qt_version_arm64: 6.10.0
|
|
||||||
# macOS
|
# macOS
|
||||||
- os: macos-15
|
- os: macos-15
|
||||||
qt_version: 6.10.1
|
qt_version: 6.10.1
|
||||||
|
|
@ -58,7 +57,7 @@ jobs:
|
||||||
set-env: false
|
set-env: false
|
||||||
add-tools-to-path: false
|
add-tools-to-path: false
|
||||||
arch: win64_msvc2022_arm64_cross_compiled
|
arch: win64_msvc2022_arm64_cross_compiled
|
||||||
version: ${{ matrix.qt_version_arm64 }}
|
version: ${{ matrix.qt_version }}
|
||||||
|
|
||||||
- name: Build x64 binaries (Windows)
|
- name: Build x64 binaries (Windows)
|
||||||
if: runner.os == 'Windows'
|
if: runner.os == 'Windows'
|
||||||
|
|
@ -76,7 +75,7 @@ jobs:
|
||||||
set "PATH=%QT_PATH%;%PATH%"
|
set "PATH=%QT_PATH%;%PATH%"
|
||||||
scripts\build-arch.bat Release arm64
|
scripts\build-arch.bat Release arm64
|
||||||
env:
|
env:
|
||||||
QT_PATH: ${{ runner.workspace }}\Qt\${{ matrix.qt_version_arm64 }}\msvc2022_arm64\bin
|
QT_PATH: ${{ runner.workspace }}\Qt\${{ matrix.qt_version }}\msvc2022_arm64\bin
|
||||||
|
|
||||||
- name: Build Package
|
- name: Build Package
|
||||||
shell: pwsh
|
shell: pwsh
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue