mirror of
https://github.com/pybind/pybind11.git
synced 2024-11-11 16:13:53 +00:00
Tracking ci.yml changes from master.
This commit is contained in:
parent
fd68dede10
commit
97868321a3
6
.github/workflows/ci_sh_def.yml
vendored
6
.github/workflows/ci_sh_def.yml
vendored
@ -185,7 +185,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.9.0
|
uses: ilammy/msvc-dev-cmd@v1.10.0
|
||||||
with:
|
with:
|
||||||
arch: x64
|
arch: x64
|
||||||
|
|
||||||
@ -784,7 +784,7 @@ jobs:
|
|||||||
uses: jwlawson/actions-setup-cmake@v1.11
|
uses: jwlawson/actions-setup-cmake@v1.11
|
||||||
|
|
||||||
- name: Prepare MSVC
|
- name: Prepare MSVC
|
||||||
uses: ilammy/msvc-dev-cmd@v1.9.0
|
uses: ilammy/msvc-dev-cmd@v1.10.0
|
||||||
with:
|
with:
|
||||||
arch: x86
|
arch: x86
|
||||||
|
|
||||||
@ -831,7 +831,7 @@ jobs:
|
|||||||
uses: jwlawson/actions-setup-cmake@v1.11
|
uses: jwlawson/actions-setup-cmake@v1.11
|
||||||
|
|
||||||
- name: Prepare MSVC
|
- name: Prepare MSVC
|
||||||
uses: ilammy/msvc-dev-cmd@v1.9.0
|
uses: ilammy/msvc-dev-cmd@v1.10.0
|
||||||
with:
|
with:
|
||||||
toolset: 14.0
|
toolset: 14.0
|
||||||
|
|
||||||
|
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-10-06 00:50:45.377210798 -0700
|
--- ci.yml 2021-10-11 13:18:34.061740320 -0700
|
||||||
+++ ci_sh_def.yml 2021-10-06 00:51:20.843612007 -0700
|
+++ ci_sh_def.yml 2021-10-11 13:20:02.319713610 -0700
|
||||||
@@ -1,4 +1,16 @@
|
@@ -1,4 +1,16 @@
|
||||||
-name: CI-SH-AVL
|
-name: CI-SH-AVL
|
||||||
+# PLEASE KEEP THIS GROUP OF FILES IN SYNC AT ALL TIMES:
|
+# PLEASE KEEP THIS GROUP OF FILES IN SYNC AT ALL TIMES:
|
||||||
|
Loading…
Reference in New Issue
Block a user