mirror of
https://github.com/pybind/pybind11.git
synced 2025-01-20 01:42:37 +00:00
Tracking ci.yml changes from master.
This commit is contained in:
parent
9be81c84fa
commit
1f99e8e63a
18
.github/workflows/ci_sh_def.yml
vendored
18
.github/workflows/ci_sh_def.yml
vendored
@ -87,7 +87,7 @@ jobs:
|
||||
run: brew install boost
|
||||
|
||||
- name: Update CMake
|
||||
uses: jwlawson/actions-setup-cmake@v1.8
|
||||
uses: jwlawson/actions-setup-cmake@v1.9
|
||||
|
||||
- name: Cache wheels
|
||||
if: runner.os == 'macOS'
|
||||
@ -165,7 +165,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
|
||||
uses: ilammy/msvc-dev-cmd@v1.8.0
|
||||
with:
|
||||
arch: x64
|
||||
|
||||
@ -207,7 +207,7 @@ jobs:
|
||||
debug: ${{ matrix.python-debug }}
|
||||
|
||||
- name: Update CMake
|
||||
uses: jwlawson/actions-setup-cmake@v1.8
|
||||
uses: jwlawson/actions-setup-cmake@v1.9
|
||||
|
||||
- name: Valgrind cache
|
||||
if: matrix.valgrind
|
||||
@ -461,7 +461,7 @@ jobs:
|
||||
run: python3 -m pip install --upgrade pip
|
||||
|
||||
- name: Update CMake
|
||||
uses: jwlawson/actions-setup-cmake@v1.8
|
||||
uses: jwlawson/actions-setup-cmake@v1.9
|
||||
|
||||
- name: Configure
|
||||
shell: bash
|
||||
@ -748,10 +748,10 @@ jobs:
|
||||
architecture: x86
|
||||
|
||||
- name: Update CMake
|
||||
uses: jwlawson/actions-setup-cmake@v1.8
|
||||
uses: jwlawson/actions-setup-cmake@v1.9
|
||||
|
||||
- name: Prepare MSVC
|
||||
uses: ilammy/msvc-dev-cmd@v1
|
||||
uses: ilammy/msvc-dev-cmd@v1.8.0
|
||||
with:
|
||||
arch: x86
|
||||
|
||||
@ -795,10 +795,10 @@ jobs:
|
||||
python-version: ${{ matrix.python }}
|
||||
|
||||
- name: Update CMake
|
||||
uses: jwlawson/actions-setup-cmake@v1.8
|
||||
uses: jwlawson/actions-setup-cmake@v1.9
|
||||
|
||||
- name: Prepare MSVC
|
||||
uses: ilammy/msvc-dev-cmd@v1
|
||||
uses: ilammy/msvc-dev-cmd@v1.8.0
|
||||
with:
|
||||
toolset: 14.0
|
||||
|
||||
@ -851,7 +851,7 @@ jobs:
|
||||
python-version: ${{ matrix.python }}
|
||||
|
||||
- name: Update CMake
|
||||
uses: jwlawson/actions-setup-cmake@v1.8
|
||||
uses: jwlawson/actions-setup-cmake@v1.9
|
||||
|
||||
- name: Prepare env
|
||||
run: python -m pip install -r tests/requirements.txt --prefer-binary
|
||||
|
4
.github/workflows/ci_sh_def.yml.patch
vendored
4
.github/workflows/ci_sh_def.yml.patch
vendored
@ -1,5 +1,5 @@
|
||||
--- ci.yml 2021-04-22 06:30:10.041039988 -0700
|
||||
+++ ci_sh_def.yml 2021-04-22 06:30:36.111366491 -0700
|
||||
--- ci.yml 2021-05-21 13:42:19.190272826 -0700
|
||||
+++ ci_sh_def.yml 2021-05-21 13:43:22.370288175 -0700
|
||||
@@ -1,4 +1,15 @@
|
||||
-name: CI-SH-AVL
|
||||
+# PLEASE KEEP THIS GROUP OF FILES IN SYNC AT ALL TIMES:
|
||||
|
Loading…
Reference in New Issue
Block a user