Skip to content

Commit 0216c38

Browse files
Merge pull request #1930 from Saransh-cpp/fix-build-wheels
Fix release
2 parents 27e713d + 348ea23 commit 0216c38

File tree

4 files changed

+12
-2
lines changed

4 files changed

+12
-2
lines changed

.github/release_checklist.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
- Update `CHANGELOG.md` with a summary of the release
99

1010
- Update jax and jaxlib to latest version in `pybamm.util` and fix any bugs that arise
11-
- Update baseline of default-registry in `vcpkg-configuration.json`
11+
- 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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,16 @@ jobs:
4141
CIBW_BEFORE_ALL_LINUX: "bash build_manylinux_wheels/install_sundials.sh 5.8.1 5.7.0"
4242
CIBW_BEFORE_BUILD_LINUX: "python -m pip install cmake"
4343

44+
# see https://github.com/pybamm-team/PyBaMM/pull/1930
45+
- name: Install the latest version of vcpkg on windows
46+
if: matrix.os == 'windows-latest'
47+
run: |
48+
cd C:\
49+
rm -r -fo 'C:\vcpkg'
50+
git clone https://github.com/microsoft/vcpkg
51+
cd vcpkg
52+
.\bootstrap-vcpkg.bat
53+
4454
- name: Cache packages installed through vcpkg on windows
4555
if: matrix.os == 'windows-latest'
4656
uses: actions/cache@v2

.gitmodules

Whitespace-only changes.

vcpkg-configuration.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"default-registry": {
33
"kind": "builtin",
4-
"baseline": "699c8779f1b0feb4ed3564716d1ed31f69663ea6"
4+
"baseline": ""
55
},
66
"registries": [
77
{

0 commit comments

Comments
 (0)