Skip to content

Commit

Permalink
use vs2022 for Qbs build
Browse files Browse the repository at this point in the history
* update to Qt 6.2.3 for Qbs build
* update qbs to fix build issue
  • Loading branch information
arBmind committed Feb 5, 2022
1 parent fe5b3d5 commit df930d3
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build_cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ jobs:
config:
- {
name: "Windows Latest MSVC", artifact: "Windows-MSVC",
os: windows-latest,
os: windows-2019,
cc: "cl", cxx: "cl",
environment_script: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat",
is_msvc: true
}
# - {
# name: "Windows Latest MinGW", artifact: "Windows-MinGW",
# os: windows-latest,
# os: windows-2019,
# cc: "gcc", cxx: "g++",
# is_msvc: false
# }
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build_qbs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
fail-fast: false
matrix:
config:
- name: "Windows Latest MSVC"
- name: "Windows 2022 MSVC"
artifact: "Windows-MSVC"
os: windows-latest
qt_version: "6.2.2"
os: windows-2022
qt_version: "6.2.3"
qt_arch: "win64_msvc2019_64"
qt_modules: qtbase qtdeclarative qttools qtsvg qttranslations qtimageformats qtserialport qtquicktimeline qtquick3d qt5compat qtshadertools
qt_tools: tools_openssl_x64,1.1.1-10,qt.tools.openssl.win_x64
Expand Down Expand Up @@ -42,7 +42,7 @@ jobs:
- run: |
7z x qbs.zip -oqbs
echo "${{ github.workspace }}/qbs/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
- name: Get JOM
shell: cmake -P {0}
run: file(DOWNLOAD "${{ matrix.config.jom_url }}" ./jom.zip SHOW_PROGRESS)
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
run: |
qbs setup-toolchains --detect
qbs setup-qt $Env:Qt6_DIR\bin\qmake.exe qt-x64
qbs config profiles.qt-x64.baseProfile MSVC2019-x64
qbs config profiles.qt-x64.baseProfile MSVC0-x64
- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -127,7 +127,7 @@ jobs:
- name: x86 Setup Qbs
run: |
qbs setup-qt $Env:Qt5_DIR\bin\qmake.exe qt-x86
qbs config profiles.qt-x86.baseProfile MSVC2019-x64_x86
qbs config profiles.qt-x86.baseProfile MSVC0-x64_x86
- name: x86 Python
uses: actions/setup-python@v2
Expand Down
2 changes: 1 addition & 1 deletion src/shared/qbs

0 comments on commit df930d3

Please sign in to comment.