To: vim_dev@googlegroups.com Subject: Patch 8.2.2158 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.2158 Problem: CI on cirrus times out, coveralls doesn't always run. Solution: Set timeout to 20 minutes. Adjust condition. (closes #7493) Files: .cirrus.yml, .github/workflows/ci.yml *** ../vim-8.2.2157/.cirrus.yml 2020-08-01 16:08:14.805278012 +0200 --- .cirrus.yml 2020-12-18 16:28:44.088152699 +0100 *************** *** 3,8 **** --- 3,10 ---- FEATURES: huge freebsd_12_task: + only_if: $CIRRUS_TAG == '' + timeout_in: 20m freebsd_instance: image: freebsd-12-1-release-amd64 install_script: *** ../vim-8.2.2157/.github/workflows/ci.yml 2020-12-18 13:31:28.340166522 +0100 --- .github/workflows/ci.yml 2020-12-18 16:28:44.088152699 +0100 *************** *** 231,237 **** runs-on: ubuntu-latest needs: linux ! if: github.event_name != 'pull_request' steps: - name: Parallel finished --- 231,237 ---- runs-on: ubuntu-latest needs: linux ! if: always() && github.event_name != 'pull_request' steps: - name: Parallel finished *** ../vim-8.2.2157/src/version.c 2020-12-18 15:37:57.248171925 +0100 --- src/version.c 2020-12-18 16:27:40.484397385 +0100 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 2158, /**/ -- Eye have a spelling checker, it came with my PC; It plainly marks four my revue mistakes I cannot sea. I've run this poem threw it, I'm sure your please to no, It's letter perfect in it's weigh, my checker tolled me sew! /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///