From 97868321a304c0d46cda80bc46dc30d8897997bb Mon Sep 17 00:00:00 2001 From: "Ralf W. Grosse-Kunstleve" Date: Mon, 11 Oct 2021 13:20:16 -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 deae0060a..ad016a2b5 100644 --- a/.github/workflows/ci_sh_def.yml +++ b/.github/workflows/ci_sh_def.yml @@ -185,7 +185,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.9.0 + uses: ilammy/msvc-dev-cmd@v1.10.0 with: arch: x64 @@ -784,7 +784,7 @@ jobs: uses: jwlawson/actions-setup-cmake@v1.11 - name: Prepare MSVC - uses: ilammy/msvc-dev-cmd@v1.9.0 + uses: ilammy/msvc-dev-cmd@v1.10.0 with: arch: x86 @@ -831,7 +831,7 @@ jobs: uses: jwlawson/actions-setup-cmake@v1.11 - name: Prepare MSVC - uses: ilammy/msvc-dev-cmd@v1.9.0 + uses: ilammy/msvc-dev-cmd@v1.10.0 with: toolset: 14.0 diff --git a/.github/workflows/ci_sh_def.yml.patch b/.github/workflows/ci_sh_def.yml.patch index b6e1db930..4bdb2fc21 100644 --- a/.github/workflows/ci_sh_def.yml.patch +++ b/.github/workflows/ci_sh_def.yml.patch @@ -1,5 +1,5 @@ ---- ci.yml 2021-10-06 00:50:45.377210798 -0700 -+++ ci_sh_def.yml 2021-10-06 00:51:20.843612007 -0700 +--- ci.yml 2021-10-11 13:18:34.061740320 -0700 ++++ ci_sh_def.yml 2021-10-11 13:20:02.319713610 -0700 @@ -1,4 +1,16 @@ -name: CI-SH-AVL +# PLEASE KEEP THIS GROUP OF FILES IN SYNC AT ALL TIMES: