From 68d1aa83aca566f29eb10a287372ea07e0bd1f18 Mon Sep 17 00:00:00 2001 From: "Ralf W. Grosse-Kunstleve" Date: Sat, 14 Aug 2021 08:38:56 -0700 Subject: [PATCH] Tracking ci.yml changes from master. --- .github/workflows/ci_sh_def.yml | 22 +++++++++++----------- .github/workflows/ci_sh_def.yml.patch | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci_sh_def.yml b/.github/workflows/ci_sh_def.yml index 09bd9a914..39cd36d70 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.9 + uses: jwlawson/actions-setup-cmake@v1.10 - name: Cache wheels if: runner.os == 'macOS' @@ -208,7 +208,7 @@ jobs: debug: ${{ matrix.python-debug }} - name: Update CMake - uses: jwlawson/actions-setup-cmake@v1.9 + uses: jwlawson/actions-setup-cmake@v1.10 - name: Valgrind cache if: matrix.valgrind @@ -463,7 +463,7 @@ jobs: run: python3 -m pip install --upgrade pip - name: Update CMake - uses: jwlawson/actions-setup-cmake@v1.9 + uses: jwlawson/actions-setup-cmake@v1.10 - name: Configure shell: bash @@ -615,13 +615,13 @@ jobs: - name: VAR_BUILD_TYPE 7 if: matrix.centos == 7 - run: echo Release > VAR_BUILD_TYPE + run: echo MinSizeRel > VAR_BUILD_TYPE - # Using Debug to avoid segfault that appeared around 2021-06-04, + # Using Release to avoid segfault that appeared around 2021-06-04, # apparently when the gcc version changed from 8.3 to 8.4. - name: VAR_BUILD_TYPE 8 if: matrix.centos == 8 - run: echo Debug > VAR_BUILD_TYPE + run: echo Release > VAR_BUILD_TYPE - name: Configure shell: bash @@ -687,7 +687,7 @@ jobs: -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") working-directory: /build-tests - - name: Run tests + - name: Python tests run: make pytest -j 2 working-directory: /build-tests @@ -761,7 +761,7 @@ jobs: architecture: x86 - name: Update CMake - uses: jwlawson/actions-setup-cmake@v1.9 + uses: jwlawson/actions-setup-cmake@v1.10 - name: Prepare MSVC uses: ilammy/msvc-dev-cmd@v1.9.0 @@ -784,7 +784,7 @@ jobs: - name: Build C++11 run: cmake --build build -j 2 - - name: Run tests + - name: Python tests run: cmake --build build -t pytest win32-msvc2015: @@ -808,7 +808,7 @@ jobs: python-version: ${{ matrix.python }} - name: Update CMake - uses: jwlawson/actions-setup-cmake@v1.9 + uses: jwlawson/actions-setup-cmake@v1.10 - name: Prepare MSVC uses: ilammy/msvc-dev-cmd@v1.9.0 @@ -864,7 +864,7 @@ jobs: python-version: ${{ matrix.python }} - name: Update CMake - uses: jwlawson/actions-setup-cmake@v1.9 + uses: jwlawson/actions-setup-cmake@v1.10 - 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 cf3520d96..83aeaa60c 100644 --- a/.github/workflows/ci_sh_def.yml.patch +++ b/.github/workflows/ci_sh_def.yml.patch @@ -1,5 +1,5 @@ ---- ci.yml 2021-07-30 11:29:33.606510028 -0700 -+++ ci_sh_def.yml 2021-07-30 12:20:02.822962583 -0700 +--- ci.yml 2021-08-14 07:51:13.991347947 -0700 ++++ ci_sh_def.yml 2021-08-14 08:36:43.163463393 -0700 @@ -1,4 +1,16 @@ -name: CI-SH-AVL +# PLEASE KEEP THIS GROUP OF FILES IN SYNC AT ALL TIMES: