From c47f6aaf43ef83f61e5c366789a7a5eb4383fee6 Mon Sep 17 00:00:00 2001 From: "Ralf W. Grosse-Kunstleve" Date: Thu, 27 May 2021 11:31:54 -0700 Subject: [PATCH] Tracking ci.yml changes from master. --- .github/workflows/ci_sh_def.yml | 6 +++--- .github/workflows/ci_sh_def.yml.patch | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci_sh_def.yml b/.github/workflows/ci_sh_def.yml index a8791fee9..46b96e08c 100644 --- a/.github/workflows/ci_sh_def.yml +++ b/.github/workflows/ci_sh_def.yml @@ -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.8.0 + uses: ilammy/msvc-dev-cmd@v1.8.1 with: arch: x64 @@ -751,7 +751,7 @@ jobs: uses: jwlawson/actions-setup-cmake@v1.9 - name: Prepare MSVC - uses: ilammy/msvc-dev-cmd@v1.8.0 + uses: ilammy/msvc-dev-cmd@v1.8.1 with: arch: x86 @@ -798,7 +798,7 @@ jobs: uses: jwlawson/actions-setup-cmake@v1.9 - name: Prepare MSVC - uses: ilammy/msvc-dev-cmd@v1.8.0 + uses: ilammy/msvc-dev-cmd@v1.8.1 with: toolset: 14.0 diff --git a/.github/workflows/ci_sh_def.yml.patch b/.github/workflows/ci_sh_def.yml.patch index 4984f2a8b..4dad0786a 100644 --- a/.github/workflows/ci_sh_def.yml.patch +++ b/.github/workflows/ci_sh_def.yml.patch @@ -1,5 +1,5 @@ ---- ci.yml 2021-05-21 13:42:19.190272826 -0700 -+++ ci_sh_def.yml 2021-05-21 13:43:22.370288175 -0700 +--- ci.yml 2021-05-27 11:30:03.442224943 -0700 ++++ ci_sh_def.yml 2021-05-27 11:30:42.672719066 -0700 @@ -1,4 +1,15 @@ -name: CI-SH-AVL +# PLEASE KEEP THIS GROUP OF FILES IN SYNC AT ALL TIMES: