Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-14 09:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into smart_holder

Browse Source
This commit is contained in:
Ralf W. Grosse-Kunstleve 2021-05-21 13:42:19 -07:00
commit 9be81c84fa
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.github/workflows/ci.yml vendored
View File

@ -76,7 +76,7 @@ jobs:
run: brew install boost run: brew install boost
- name: Update CMake - name: Update CMake
uses: jwlawson/actions-setup-cmake@v1.8 uses: jwlawson/actions-setup-cmake@v1.9
- name: Cache wheels - name: Cache wheels
if: runner.os == 'macOS' if: runner.os == 'macOS'
@ -152,7 +152,7 @@ jobs:
# MSVC, but for now, this action works: # MSVC, but for now, this action works:
- name: Prepare compiler environment for Windows 🐍 2.7 - name: Prepare compiler environment for Windows 🐍 2.7
if: matrix.python == 2.7 && runner.os == 'Windows' if: matrix.python == 2.7 && runner.os == 'Windows'
uses: ilammy/msvc-dev-cmd@v1 uses: ilammy/msvc-dev-cmd@v1.8.0
with: with:
arch: x64 arch: x64
@ -194,7 +194,7 @@ jobs:
debug: ${{ matrix.python-debug }} debug: ${{ matrix.python-debug }}
- name: Update CMake - name: Update CMake
uses: jwlawson/actions-setup-cmake@v1.8 uses: jwlawson/actions-setup-cmake@v1.9
- name: Valgrind cache - name: Valgrind cache
if: matrix.valgrind if: matrix.valgrind
@ -446,7 +446,7 @@ jobs:
run: python3 -m pip install --upgrade pip run: python3 -m pip install --upgrade pip
- name: Update CMake - name: Update CMake
uses: jwlawson/actions-setup-cmake@v1.8 uses: jwlawson/actions-setup-cmake@v1.9
- name: Configure - name: Configure
shell: bash shell: bash
@ -728,10 +728,10 @@ jobs:
architecture: x86 architecture: x86
- name: Update CMake - name: Update CMake
uses: jwlawson/actions-setup-cmake@v1.8 uses: jwlawson/actions-setup-cmake@v1.9
- name: Prepare MSVC - name: Prepare MSVC
uses: ilammy/msvc-dev-cmd@v1 uses: ilammy/msvc-dev-cmd@v1.8.0
with: with:
arch: x86 arch: x86
@ -774,10 +774,10 @@ jobs:
python-version: ${{ matrix.python }} python-version: ${{ matrix.python }}
- name: Update CMake - name: Update CMake
uses: jwlawson/actions-setup-cmake@v1.8 uses: jwlawson/actions-setup-cmake@v1.9
- name: Prepare MSVC - name: Prepare MSVC
uses: ilammy/msvc-dev-cmd@v1 uses: ilammy/msvc-dev-cmd@v1.8.0
with: with:
toolset: 14.0 toolset: 14.0
@ -828,7 +828,7 @@ jobs:
python-version: ${{ matrix.python }} python-version: ${{ matrix.python }}
- name: Update CMake - name: Update CMake
uses: jwlawson/actions-setup-cmake@v1.8 uses: jwlawson/actions-setup-cmake@v1.9
- name: Prepare env - name: Prepare env
run: python -m pip install -r tests/requirements.txt --prefer-binary run: python -m pip install -r tests/requirements.txt --prefer-binary

2
.github/workflows/configure.yml vendored
View File

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