mirror of
https://github.com/pybind/pybind11.git
synced 2024-11-23 13:45:10 +00:00
Tracking ci.yml changes from master.
This commit is contained in:
parent
2cfc017e2d
commit
c47f6aaf43
6
.github/workflows/ci_sh_def.yml
vendored
6
.github/workflows/ci_sh_def.yml
vendored
@ -165,7 +165,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.8.0
|
uses: ilammy/msvc-dev-cmd@v1.8.1
|
||||||
with:
|
with:
|
||||||
arch: x64
|
arch: x64
|
||||||
|
|
||||||
@ -751,7 +751,7 @@ jobs:
|
|||||||
uses: jwlawson/actions-setup-cmake@v1.9
|
uses: jwlawson/actions-setup-cmake@v1.9
|
||||||
|
|
||||||
- name: Prepare MSVC
|
- name: Prepare MSVC
|
||||||
uses: ilammy/msvc-dev-cmd@v1.8.0
|
uses: ilammy/msvc-dev-cmd@v1.8.1
|
||||||
with:
|
with:
|
||||||
arch: x86
|
arch: x86
|
||||||
|
|
||||||
@ -798,7 +798,7 @@ jobs:
|
|||||||
uses: jwlawson/actions-setup-cmake@v1.9
|
uses: jwlawson/actions-setup-cmake@v1.9
|
||||||
|
|
||||||
- name: Prepare MSVC
|
- name: Prepare MSVC
|
||||||
uses: ilammy/msvc-dev-cmd@v1.8.0
|
uses: ilammy/msvc-dev-cmd@v1.8.1
|
||||||
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-05-21 13:42:19.190272826 -0700
|
--- ci.yml 2021-05-27 11:30:03.442224943 -0700
|
||||||
+++ ci_sh_def.yml 2021-05-21 13:43:22.370288175 -0700
|
+++ ci_sh_def.yml 2021-05-27 11:30:42.672719066 -0700
|
||||||
@@ -1,4 +1,15 @@
|
@@ -1,4 +1,15 @@
|
||||||
-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