Merge branch 'master' into smart_holder

This commit is contained in:
Ralf W. Grosse-Kunstleve
2021-05-27 11:30:03 -07:00
9 changed files with 62 additions and 6 deletions

View File

@@ -152,7 +152,7 @@ jobs:
# MSVC, but for now, this action works:
- name: Prepare compiler environment for Windows 🐍 2.7
if: matrix.python == 2.7 && runner.os == 'Windows'
uses: ilammy/msvc-dev-cmd@v1.8.0
uses: ilammy/msvc-dev-cmd@v1.8.1
with:
arch: x64
@@ -731,7 +731,7 @@ jobs:
uses: jwlawson/actions-setup-cmake@v1.9
- name: Prepare MSVC
uses: ilammy/msvc-dev-cmd@v1.8.0
uses: ilammy/msvc-dev-cmd@v1.8.1
with:
arch: x86
@@ -777,7 +777,7 @@ jobs:
uses: jwlawson/actions-setup-cmake@v1.9
- name: Prepare MSVC
uses: ilammy/msvc-dev-cmd@v1.8.0
uses: ilammy/msvc-dev-cmd@v1.8.1
with:
toolset: 14.0