Updating GitHub CI to from MSVC2019 to MSVC2022

npwoods · Jul 9, 2023 · b897869 · b897869
1 parent 25c71b2
commit b897869
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/windows_msvc2019.yml → .github/workflows/windows_msvc2022.yml b/.github/workflows/windows_msvc2019.yml → .github/workflows/windows_msvc2022.yml
@@ -1,8 +1,8 @@
 #############################################
-# BletchMAME Windows MSVC2019 Github Action #
+# BletchMAME Windows MSVC2022 Github Action #
 #############################################
 
-name: Windows MSVC2019
+name: Windows MSVC2022
 
 # Controls when the action will run. Triggers the workflow on push or pull request
 # events but only for the master branch
@@ -21,7 +21,7 @@ jobs:
       matrix:
         config: [Debug, Release]
         qt: [6.2.1, 6.4.0]
-    runs-on: windows-2019
+    runs-on: windows-latest
     defaults:
       run:
         shell: msys2 {0}
@@ -59,7 +59,7 @@ jobs:
         cache-name: cache-deps
       with:
         path: deps/install
-        key: ${{ runner.os }}-build-${{ matrix.config }}-${{ env.cache-name }}-${{ hashFiles('.github/workflows/windows_msvc2019.yml', 'scripts/zlib_build_msvc.sh', 'scripts/expat_build_msvc.sh', 'scripts/quazip_build_msvc.sh', 'scripts/lzma_build_msvc.sh')}}
+        key: ${{ runner.os }}-build-${{ matrix.config }}-${{ env.cache-name }}-${{ hashFiles('.github/workflows/windows_msvc2022.yml', 'scripts/zlib_build_msvc.sh', 'scripts/expat_build_msvc.sh', 'scripts/quazip_build_msvc.sh', 'scripts/lzma_build_msvc.sh')}}
 
     # Retrieve Zlib
     - name: Retrieve Zlib
@@ -119,5 +119,5 @@ jobs:
       run: |
         echo Running Unit Tests
         echo Listing directory
-        ls -l ./build/msvc2019/${{ matrix.config }}
-        cd ./build/msvc2019/${{ matrix.config }} ; export PATH=$PATH:`cygpath $Qt6_DIR/bin`:`cygpath $GITHUB_WORKSPACE/deps/install/msvc2019/bin` ; echo $PATH ; ./BletchMAME_tests.exe
+        ls -l ./build/msvc2022/${{ matrix.config }}
+        cd ./build/msvc2022/${{ matrix.config }} ; export PATH=$PATH:`cygpath $Qt6_DIR/bin`:`cygpath $GITHUB_WORKSPACE/deps/install/msvc2022/bin` ; echo $PATH ; ./BletchMAME_tests.exe
diff --git a/scripts/bletchmame_build_msvc.sh b/scripts/bletchmame_build_msvc.sh
@@ -15,7 +15,7 @@ TOOLSET=v142
 
 # config is "Debug" by default, but can also be "Release"
 CONFIG=Debug
-MSVC_VER=msvc2019
+MSVC_VER=msvc2022
 
 # QT version is 6.2.0 by default
 QT_VERSION=6.2.0

diff --git a/scripts/expat_build_msvc.sh b/scripts/expat_build_msvc.sh
@@ -13,7 +13,7 @@ if [ -z "$BASH_SOURCE" ]; then
 fi
 
 CONFIG=Debug
-MSVC_VER=msvc2019
+MSVC_VER=msvc2022
 
 # parse arguments
 while getopts "c:v:" OPTION; do

diff --git a/scripts/liblzma_build_msvc.sh b/scripts/liblzma_build_msvc.sh
@@ -13,7 +13,7 @@ if [ -z "$BASH_SOURCE" ]; then
 fi
 
 CONFIG=Debug
-MSVC_VER=msvc2019
+MSVC_VER=msvc2022
 
 # parse arguments
 while getopts "c:t:v:" OPTION; do

diff --git a/scripts/lzma_build_msvc.sh b/scripts/lzma_build_msvc.sh
@@ -13,7 +13,7 @@ if [ -z "$BASH_SOURCE" ]; then
 fi
 
 CONFIG=Debug
-MSVC_VER=msvc2019
+MSVC_VER=msvc2022
 
 # parse arguments
 while getopts "c:t:v:" OPTION; do

diff --git a/scripts/quazip_build_msvc.sh b/scripts/quazip_build_msvc.sh
@@ -13,7 +13,7 @@ if [ -z "$BASH_SOURCE" ]; then
 fi
 
 CONFIG=Debug
-MSVC_VER=msvc2019
+MSVC_VER=msvc2022
 
 # QT version is 6.2.0 by default
 QT_VERSION=6.2.0

diff --git a/scripts/zlib_build_msvc.sh b/scripts/zlib_build_msvc.sh
@@ -13,7 +13,7 @@ if [ -z "$BASH_SOURCE" ]; then
 fi
 
 CONFIG=Debug
-MSVC_VER=msvc2019
+MSVC_VER=msvc2022
 
 # parse arguments
 while getopts "c:v:" OPTION; do