Merge pull request #409 from treefrogframework/actions_yml4

Update actions yml

Author: treefrogframework

.github/workflows/actions.yml

@@ -190,26 +190,30 @@ jobs:
       run: |
         $GITHUB_WORKSPACE/tools/test/releasetest/releasetest
 
-  build-windows-qt67-msvc2022:
+  build-windows-qt68-msvc2022:
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@main
+    - name: Setup msbuild
+      uses: microsoft/setup-msbuild@v2
+      with:
+        vs-version: '[17,18)'  # 17.xx
+        msbuild-architecture: x64
     - name: Install Qt
       uses: jurplel/install-qt-action@v4
       with:
-        version: '6.7.3'
-        host: 'windows'
-        target: 'desktop'
-    - name: Install VisualStudio tools
+        version:      6.8
+        host:         windows
+        target:       desktop
+        setup-python: false
+    - name: Install tools
       run: |
-        choco install visualstudio2022community -y
-        choco install visualstudio2022-workload-nativedesktop -y
         choco install sqlite -y
         choco install cmake -y
-    - name: Build for debug mode
+    - name: Debug build
       shell: cmd
       run: |
-        call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
+        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
         set CL=/MP
         qmake -version
         call configure.bat --enable-debug
@@ -219,15 +223,15 @@ jobs:
         cd ..\tools
         nmake
         nmake install
-    - name: Test modules
+    - name: Module test
       shell: cmd
       run: |
         cd src/test
         call testall.bat
-    - name: Build for release mode
+    - name: Release build
       shell: cmd
       run: |
-        call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
+        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
         set CL=/MP
         call configure.bat
         cd src
@@ -236,28 +240,29 @@ jobs:
         cd ..\tools
         nmake
         nmake install
-    - name: Test release
+    - name: Release test
       working-directory: tools\test\releasetest
       run: |
         .\releasetest.bat
 
-  build-windows-qt67-msvc2019:
+  build-windows-qt68-msvc2019:
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@main
     - name: Install Qt
       uses: jurplel/install-qt-action@v4
       with:
-        version: '6.7.3'
-        host: 'windows'
-        target: 'desktop'
+        version:      6.8
+        host:         windows
+        target:       desktop
+        setup-python: false
     - name: Install VisualStudio tools
       run: |
         choco install visualstudio2019community -y
         choco install visualstudio2019-workload-nativedesktop -y
         choco install sqlite -y
         choco install cmake -y
-    - name: Build for debug mode
+    - name: Debug build
       shell: cmd
       run: |
         call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
@@ -270,12 +275,12 @@ jobs:
         cd ..\tools
         nmake
         nmake install
-    - name: Test modules
+    - name: Module test
       shell: cmd
       run: |
         cd src/test
         call testall.bat
-    - name: Build for release mode
+    - name: Release build
       shell: cmd
       run: |
         call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
@@ -287,7 +292,7 @@ jobs:
         cd ..\tools
         nmake
         nmake install
-    - name: Test release
+    - name: Release test
       working-directory: tools\test\releasetest
       run: |
         .\releasetest.bat
@@ -299,16 +304,18 @@ jobs:
     - name: Install Qt
       uses: jurplel/install-qt-action@v4
       with:
-        version: '6.5.2'
-        host: 'windows'
-        target: 'desktop'
+        version:      6.5.2
+        host:         windows
+        target:       desktop
+        arch:         win64_msvc2019_64
+        setup-python: false
     - name: Install VisualStudio tools
       run: |
         choco install visualstudio2019community -y
         choco install visualstudio2019-workload-nativedesktop -y
         choco install sqlite -y
         choco install cmake -y
-    - name: Build for debug mode
+    - name: Debug build
       shell: cmd
       run: |
         call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
@@ -321,12 +328,12 @@ jobs:
         cd ..\tools
         nmake
         nmake install
-    - name: Test modules
+    - name: Module test
       shell: cmd
       run: |
         cd src/test
         call testall.bat
-    - name: Build for release mode
+    - name: Release build
       shell: cmd
       run: |
         call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
@@ -338,7 +345,7 @@ jobs:
         cd ..\tools
         nmake
         nmake install
-    - name: Test release
+    - name: Release test
       working-directory: tools\test\releasetest
       run: |
         .\releasetest.bat

build.bat

@@ -1,4 +1,4 @@
-@ECHO OFF
+@echo off
 @setlocal
 
 rem
@@ -7,14 +7,13 @@ rem
 
 set BASEDIR=%~dp0
 
-call "C:\Qt\6.8.0\msvc2022_64\bin\qtenv2.bat"
+call "C:\Qt\6.7.3\msvc2022_64\bin\qtenv2.bat"
 rem call "C:\Qt\6.5.3\msvc2019_64\bin\qtenv2.bat"
-rem call "C:\Qt\5.13.0\msvc2017\bin\qtenv2.bat"
 
 set ARCH=amd64
 set VSWHERE="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
 set VCVARSBAT=""
-set VSVER=2022 2019 2017
+set VSVER=2019
 set PATH=C:\Qt\Tools\CMake_64\bin;%PATH%
 
 if exist %VSWHERE% (
@@ -34,7 +33,7 @@ if exist %VCVARSBAT% (
   echo %VCVARSBAT% %ARCH%
   call %VCVARSBAT% %ARCH%
 ) else (
-  echo Error!  Compiler not found.
+  echo Error! Visual Studio not found.
   pause
   exit
 )