To: vim_dev@googlegroups.com Subject: Patch 8.2.2175 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.2175 Problem: Github actions: clang-11 handling suboptimal. Solution: Separate step of installing clang-11. Get ubuntu release name dynamically. (Ozaki Kiichi, closes #7514) Files: .github/workflows/ci.yml *** ../vim-8.2.2174/.github/workflows/ci.yml 2020-12-18 16:29:21.716008176 +0100 --- .github/workflows/ci.yml 2020-12-21 13:36:24.405338251 +0100 *************** *** 17,22 **** --- 17,23 ---- LOG_DIR: ${{ github.workspace }}/logs TERM: xterm DISPLAY: ':99' + DEBIAN_FRONTEND: noninteractive strategy: fail-fast: false *************** *** 54,61 **** - uses: actions/checkout@v2 - name: Install packages - env: - DEBIAN_FRONTEND: noninteractive run: | sudo apt-get install -y \ autoconf \ --- 55,60 ---- *************** *** 73,86 **** libgtk2.0-dev \ desktop-file-utils \ libtool-bin ! if [[ ${CC} = clang ]]; then ! wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - ! sudo add-apt-repository -y "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-11 main" ! sudo apt-get install -y clang-11 ! sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-11 100 ! sudo update-alternatives --set clang /usr/bin/clang-11 ! sudo update-alternatives --install /usr/bin/llvm-cov llvm-cov /usr/bin/llvm-cov-11 100 ! fi - name: Set up environment run: | --- 72,88 ---- libgtk2.0-dev \ desktop-file-utils \ libtool-bin ! ! - name: Install clang-11 ! if: matrix.compiler == 'clang' ! run: | ! wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - ! . /etc/lsb-release ! sudo add-apt-repository -y "deb http://apt.llvm.org/${DISTRIB_CODENAME}/ llvm-toolchain-${DISTRIB_CODENAME}-11 main" ! sudo apt-get install -y clang-11 ! sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-11 100 ! sudo update-alternatives --set clang /usr/bin/clang-11 ! sudo update-alternatives --install /usr/bin/llvm-cov llvm-cov /usr/bin/llvm-cov-11 100 - name: Set up environment run: | *************** *** 177,185 **** run: | ./configure --with-features=${{ matrix.features }} ${CONFOPT} --enable-fail-if-missing # Append various warning flags to CFLAGS. ! # BSD sed needs backup extension specified. ! sed -i.bak -f ci/config.mk.sed ${SRCDIR}/auto/config.mk ! sed -i.bak -f ci/config.mk.${CC}.sed ${SRCDIR}/auto/config.mk - name: Build if: (!contains(matrix.extra, 'unittests')) --- 179,186 ---- run: | ./configure --with-features=${{ matrix.features }} ${CONFOPT} --enable-fail-if-missing # Append various warning flags to CFLAGS. ! sed -i -f ci/config.mk.sed ${SRCDIR}/auto/config.mk ! sed -i -f ci/config.mk.${CC}.sed ${SRCDIR}/auto/config.mk - name: Build if: (!contains(matrix.extra, 'unittests')) *************** *** 291,296 **** --- 292,299 ---- sed -i.bak -f ci/config.mk.clang.sed ${SRCDIR}/auto/config.mk - name: Build + env: + LANG: C run: | make -j${NPROC} *** ../vim-8.2.2174/src/version.c 2020-12-21 13:05:54.243492990 +0100 --- src/version.c 2020-12-21 13:36:48.825265394 +0100 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 2175, /**/ -- Female engineers become irresistible at the age of consent and remain that way until about thirty minutes after their clinical death. Longer if it's a warm day. (Scott Adams - The Dilbert principle) /// 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 ///