To: vim_dev@googlegroups.com Subject: Patch 9.0.0676 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.0676 Problem: CI on Mac M1 with gcc actually uses clang. Solution: Remove the gcc task. (Ozaki Kiichi, closes #11297) Files: .cirrus.yml *** ../vim-9.0.0675/.cirrus.yml 2022-10-05 20:40:57.756281224 +0100 --- .cirrus.yml 2022-10-06 16:53:28.449540056 +0100 *************** *** 27,35 **** - sudo -u cirrus make test macos_task: ! name: macOS (arm64 gcc) macos_instance: image: ghcr.io/cirruslabs/macos-ventura-xcode:latest timeout_in: 20m install_script: - brew update --- 27,38 ---- - sudo -u cirrus make test macos_task: ! name: macOS m1 macos_instance: image: ghcr.io/cirruslabs/macos-ventura-xcode:latest + env: + # only run with clang, gcc is not real, it is a link to clang + CC: clang timeout_in: 20m install_script: - brew update *************** *** 41,59 **** test_script: - src/vim --version - make test - - macos_task: - name: macOS (arm64 clang) - macos_instance: - image: ghcr.io/cirruslabs/macos-ventura-xcode:latest - timeout_in: 20m - install_script: - - brew update - - brew install gettext libtool - build_script: - - NPROC=$(getconf _NPROCESSORS_ONLN) - - ./configure --with-features=${FEATURES} - - make -j${NPROC} CC=clang - test_script: - - src/vim --version - - make CC=clang test --- 44,46 ---- *** ../vim-9.0.0675/src/version.c 2022-10-06 16:33:11.753632866 +0100 --- src/version.c 2022-10-06 16:55:54.016865320 +0100 *************** *** 701,702 **** --- 701,704 ---- { /* Add new patch number below this line */ + /**/ + 676, /**/ -- ZOOT: I'm afraid our life must seem very dull and quiet compared to yours. We are but eightscore young blondes, all between sixteen and nineteen-and-a-half, cut off in this castle, with no one to protect us. Oooh. It is a lonely life ... bathing ... dressing ... undressing ... making exciting underwear.... "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///