Bump VCPKG registry baseline and update GH action.

Author: Holt59

.github/workflows/build-and-test.yml

@@ -2,54 +2,34 @@ name: Build & Test Plugin Python
 
 on:
   push:
-    branches: master
+    branches: [master]
   pull_request:
     types: [opened, synchronize, reopened]
 
 env:
-  VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
+  VCPKG_BINARY_SOURCES: clear;x-azblob,${{ vars.AZ_BLOB_VCPKG_URL }},${{ secrets.AZ_BLOB_SAS }},readwrite
 
 jobs:
   build:
     runs-on: windows-2022
     steps:
-      # https://learn.microsoft.com/en-us/vcpkg/consume/binary-caching-github-actions-cache
-      - name: Export GitHub Actions cache environment variables
-        uses: actions/github-script@v7
-        with:
-          script: |
-            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
-
       - uses: actions/setup-python@v5
         with:
           python-version: "3.12"
 
-      - name: Install Qt
-        uses: jurplel/install-qt-action@v3
+      - name: Configure Plugin Python
+        id: configure-plugin-python
+        uses: ModOrganizer2/build-with-mob-action@dev/vcpkg
         with:
-          setup-python: false
-          version: 6.7.1
-          modules:
-          cache: true
-
-      - uses: actions/checkout@v4
-
-      - name: "Set environmental variables"
-        shell: bash
-        run: |
-          echo "VCPKG_ROOT=$VCPKG_INSTALLATION_ROOT" >> $GITHUB_ENV
-
-      - name: Configure Plugin Python build
-        shell: pwsh
-        run: |
-          cmake --preset vs2022-windows-standalone `
-            "-DCMAKE_PREFIX_PATH=${env:QT_ROOT_DIR}\msvc2019_64" `
-            -DPLUGIN_PYTHON_TESTING=ON
+          mo2-dependencies: uibase
+          mo2-skip-build: true
 
       - name: Build Plugin Python
         run: cmake --build vsbuild --config RelWithDebInfo --verbose `
           --target python-tests --target runner-tests --target proxy
 
       - name: Test Plugin Python
         run: ctest --test-dir vsbuild -C RelWithDebInfo --output-on-failure
+
+      - name: Install Plugin Python
+        run: cmake --build vsbuild --config RelWithDebInfo --target INSTALL

CMakeLists.txt

@@ -26,8 +26,8 @@ set(Python_VERSION_SHORT ${Python_VERSION_MAJOR}${Python_VERSION_MINOR})
 add_subdirectory(src)
 
 # tests (if requested)
-set(PLUGIN_PYTHON_TESTING ${BUILD_TESTING} CACHE BOOL "build tests for plugin_python")
-if (PLUGIN_PYTHON_TESTING)
+set(BUILD_TESTING ${BUILD_TESTING} CACHE BOOL "build tests for plugin_python")
+if (BUILD_TESTING)
 	enable_testing()
 	add_subdirectory(tests)
 endif()

tests/python/CMakeLists.txt

@@ -40,7 +40,7 @@ UIBASE_PATH=set:${UIBASE_PATH}"
 mo2_python_pip_install(python-tests
 	DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/pylibs
 	PACKAGES pytest
-		PyQt${MO2_QT_VERSION_MAJOR}==${MO2_QT_VERSION}
+		PyQt${MO2_QT_VERSION_MAJOR}==${MO2_PYQT_VERSION}
 		PyQt${MO2_QT_VERSION_MAJOR}-Qt${MO2_QT_VERSION_MAJOR}==${MO2_QT_VERSION})
 add_dependencies(python-tests mobase)
 set_target_properties(python-tests PROPERTIES FOLDER tests/python)

tests/runner/CMakeLists.txt

@@ -52,7 +52,7 @@ mo2_python_pip_install(runner-tests
 	DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/pylibs
 	PACKAGES
 		pytest
-		PyQt${MO2_QT_VERSION_MAJOR}==${MO2_QT_VERSION}
+		PyQt${MO2_QT_VERSION_MAJOR}==${MO2_PYQT_VERSION}
 		PyQt${MO2_QT_VERSION_MAJOR}-Qt${MO2_QT_VERSION_MAJOR}==${MO2_QT_VERSION})
 
 add_dependencies(runner-tests mobase)

vcpkg.json

@@ -14,19 +14,19 @@
     "default-registry": {
       "kind": "git",
       "repository": "https://github.com/Microsoft/vcpkg",
-      "baseline": "8ae59b5b1329a51875abc71d528da93d9c3e8972"
+      "baseline": "294f76666c3000630d828703e675814c05a4fd43"
     },
     "registries": [
       {
         "kind": "git",
         "repository": "https://github.com/Microsoft/vcpkg",
-        "baseline": "8ae59b5b1329a51875abc71d528da93d9c3e8972",
+        "baseline": "294f76666c3000630d828703e675814c05a4fd43",
         "packages": ["boost*", "boost-*"]
       },
       {
         "kind": "git",
         "repository": "https://github.com/ModOrganizer2/vcpkg-registry",
-        "baseline": "dc9d84b9442c5ca4b6b8f23380e42f777f2857e5",
+        "baseline": "228cda39fe9d1eeed789c0ef64fd1235dab3b11e",
         "packages": ["mo2-*", "pybind11", "spdlog"]
       }
     ]