Merge pull request #1931 from pybamm-team/main

Merge main into develop

.github/release_checklist.md

@@ -8,4 +8,4 @@
   - Update `CHANGELOG.md` with a summary of the release
 
 - Update jax and jaxlib to latest version in `pybamm.util` and fix any bugs that arise
-- Update baseline of default-registry in `vcpkg-configuration.json`
+- If building wheels on Windows gives a `vcpkg` related error - revert the baseline of default-registry to a stable commit in `vcpkg-configuration.json` 

.github/workflows/build_wheels.yml

@@ -41,6 +41,16 @@ jobs:
           CIBW_BEFORE_ALL_LINUX: "bash build_manylinux_wheels/install_sundials.sh 5.8.1 5.7.0"
           CIBW_BEFORE_BUILD_LINUX: "python -m pip install cmake"
 
+      # see https://github.com/pybamm-team/PyBaMM/pull/1930
+      - name: Install the latest version of vcpkg on windows
+        if: matrix.os == 'windows-latest'
+        run: |
+          cd C:\
+          rm -r -fo 'C:\vcpkg'
+          git clone https://github.com/microsoft/vcpkg
+          cd vcpkg
+          .\bootstrap-vcpkg.bat
+
       - name: Cache packages installed through vcpkg on windows
         if: matrix.os == 'windows-latest'
         uses: actions/cache@v2

vcpkg-configuration.json

@@ -1,7 +1,7 @@
 {
   "default-registry": {
     "kind": "builtin",
-    "baseline": "699c8779f1b0feb4ed3564716d1ed31f69663ea6"
+    "baseline": ""
   },
   "registries": [
     {