Merge branch 'master' into sh_merge_master

This commit is contained in:
Ralf W. Grosse-Kunstleve
2021-09-23 08:56:16 -07:00
26 changed files with 208 additions and 264 deletions

View File

@@ -76,7 +76,7 @@ jobs:
run: brew install boost
- name: Update CMake
uses: jwlawson/actions-setup-cmake@v1.10
uses: jwlawson/actions-setup-cmake@v1.11
- name: Cache wheels
if: runner.os == 'macOS'
@@ -212,7 +212,7 @@ jobs:
debug: ${{ matrix.python-debug }}
- name: Update CMake
uses: jwlawson/actions-setup-cmake@v1.10
uses: jwlawson/actions-setup-cmake@v1.11
- name: Valgrind cache
if: matrix.valgrind
@@ -464,7 +464,7 @@ jobs:
run: python3 -m pip install --upgrade pip
- name: Update CMake
uses: jwlawson/actions-setup-cmake@v1.10
uses: jwlawson/actions-setup-cmake@v1.11
- name: Configure
shell: bash
@@ -757,7 +757,7 @@ jobs:
architecture: x86
- name: Update CMake
uses: jwlawson/actions-setup-cmake@v1.10
uses: jwlawson/actions-setup-cmake@v1.11
- name: Prepare MSVC
uses: ilammy/msvc-dev-cmd@v1.9.0
@@ -803,7 +803,7 @@ jobs:
python-version: ${{ matrix.python }}
- name: Update CMake
uses: jwlawson/actions-setup-cmake@v1.10
uses: jwlawson/actions-setup-cmake@v1.11
- name: Prepare MSVC
uses: ilammy/msvc-dev-cmd@v1.9.0
@@ -857,7 +857,7 @@ jobs:
python-version: ${{ matrix.python }}
- name: Update CMake
uses: jwlawson/actions-setup-cmake@v1.10
uses: jwlawson/actions-setup-cmake@v1.11
- name: Prepare env
run: python -m pip install -r tests/requirements.txt --prefer-binary

View File

@@ -56,7 +56,7 @@ jobs:
# An action for adding a specific version of CMake:
# https://github.com/jwlawson/actions-setup-cmake
- name: Setup CMake ${{ matrix.cmake }}
uses: jwlawson/actions-setup-cmake@v1.10
uses: jwlawson/actions-setup-cmake@v1.11
with:
cmake-version: ${{ matrix.cmake }}