From f8e2471c1edb187956d82dcb42a76bdb011899a8 Mon Sep 17 00:00:00 2001 From: "Ralf W. Grosse-Kunstleve" Date: Thu, 23 Sep 2021 08:58:49 -0700 Subject: [PATCH] Tracking ci.yml changes from master. --- .github/workflows/ci_sh_def.yml | 12 ++++++------ .github/workflows/ci_sh_def.yml.patch | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci_sh_def.yml b/.github/workflows/ci_sh_def.yml index 720ad4df4..2cc96812e 100644 --- a/.github/workflows/ci_sh_def.yml +++ b/.github/workflows/ci_sh_def.yml @@ -88,7 +88,7 @@ jobs: run: brew install boost - name: Update CMake - uses: jwlawson/actions-setup-cmake@v1.10 + uses: jwlawson/actions-setup-cmake@v1.11 - name: Cache wheels if: runner.os == 'macOS' @@ -227,7 +227,7 @@ jobs: debug: ${{ matrix.python-debug }} - name: Update CMake - uses: jwlawson/actions-setup-cmake@v1.10 + uses: jwlawson/actions-setup-cmake@v1.11 - name: Valgrind cache if: matrix.valgrind @@ -482,7 +482,7 @@ jobs: run: python3 -m pip install --upgrade pip - name: Update CMake - uses: jwlawson/actions-setup-cmake@v1.10 + uses: jwlawson/actions-setup-cmake@v1.11 - name: Configure shell: bash @@ -780,7 +780,7 @@ jobs: architecture: x86 - name: Update CMake - uses: jwlawson/actions-setup-cmake@v1.10 + uses: jwlawson/actions-setup-cmake@v1.11 - name: Prepare MSVC uses: ilammy/msvc-dev-cmd@v1.9.0 @@ -827,7 +827,7 @@ jobs: python-version: ${{ matrix.python }} - name: Update CMake - uses: jwlawson/actions-setup-cmake@v1.10 + uses: jwlawson/actions-setup-cmake@v1.11 - name: Prepare MSVC uses: ilammy/msvc-dev-cmd@v1.9.0 @@ -883,7 +883,7 @@ jobs: python-version: ${{ matrix.python }} - name: Update CMake - uses: jwlawson/actions-setup-cmake@v1.10 + uses: jwlawson/actions-setup-cmake@v1.11 - name: Prepare env run: python -m pip install -r tests/requirements.txt --prefer-binary diff --git a/.github/workflows/ci_sh_def.yml.patch b/.github/workflows/ci_sh_def.yml.patch index aba1ad59a..bce83194d 100644 --- a/.github/workflows/ci_sh_def.yml.patch +++ b/.github/workflows/ci_sh_def.yml.patch @@ -1,5 +1,5 @@ ---- ci.yml 2021-09-20 05:57:17.199789637 -0700 -+++ ci_sh_def.yml 2021-09-20 06:45:40.129525604 -0700 +--- ci.yml 2021-09-23 08:56:16.435724635 -0700 ++++ ci_sh_def.yml 2021-09-23 08:58:17.525809197 -0700 @@ -1,4 +1,16 @@ -name: CI-SH-AVL +# PLEASE KEEP THIS GROUP OF FILES IN SYNC AT ALL TIMES: