Patch 8.2.4061

7 views
Skip to first unread message

Bram Moolenaar

unread,
Jan 11, 2022, 8:06:40 AM1/11/22
to vim...@googlegroups.com

Patch 8.2.4061
Problem: Codecov bash script is deprecated.
Solution: Use the codecov action. (Ozaki Kiichi, closes #9505)
Files: .github/workflows/ci.yml


*** ../vim-8.2.4060/.github/workflows/ci.yml 2021-12-25 11:20:00.237496694 +0000
--- .github/workflows/ci.yml 2022-01-11 13:02:38.859833231 +0000
***************
*** 92,97 ****
--- 92,98 ----
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-13 100
sudo update-alternatives --set clang /usr/bin/clang-13
sudo update-alternatives --install /usr/bin/llvm-cov llvm-cov /usr/bin/llvm-cov-13 100
+ sudo update-alternatives --install /usr/bin/asan_symbolize asan_symbolize /usr/bin/asan_symbolize-13 100

- name: Set up environment
run: |
***************
*** 119,125 ****
;;
esac

- CFLAGS=""
if ${{ matrix.coverage == true }}; then
CFLAGS="$CFLAGS --coverage -DUSE_GCOV_FLUSH"
echo "LDFLAGS=--coverage"
--- 120,125 ----
***************
*** 218,262 ****
do_test() { sg audio "sg $(id -gn) '$*'"; }
do_test make ${SHADOWOPT} ${TEST}

! # - name: Coveralls
! # if: matrix.coverage && success() && github.event_name != 'pull_request'
! # env:
! # COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
! # COVERALLS_PARALLEL: true
! # TRAVIS_JOB_ID: ${{ github.run_id }}
! # run: |
! # sudo apt-get install -y python3-setuptools python3-wheel
! # sudo -H pip3 install pip -U
! # # needed for https support for coveralls building cffi only works with gcc, not with clang
! # CC=gcc pip3 install --user cpp-coveralls pyopenssl ndg-httpsclient pyasn1
! # ~/.local/bin/coveralls -b "${SRCDIR}" -x .xs -e "${SRCDIR}"/if_perl.c -e "${SRCDIR}"/xxd -e "${SRCDIR}"/libvterm --encodings utf-8

! - name: Codecov
if: matrix.coverage && success()
run: |
cd "${SRCDIR}"
! bash <(curl -s https://codecov.io/bash) -F "${{ matrix.features }}-${{ matrix.compiler }}-${{ matrix.extra }}"

- name: ASan logs
if: contains(matrix.extra, 'asan') && !cancelled()
run: |
for f in $(grep -lR '#[[:digit:]]* *0x[[:digit:]a-fA-F]*' "${LOG_DIR}"); do
! asan_symbolize-13 -l "$f"
false # in order to fail a job
done

! # coveralls:
! # runs-on: ubuntu-18.04
#
! # needs: linux
! # if: always() && github.event_name != 'pull_request'
#
! # steps:
! # - name: Parallel finished
! # env:
! # COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
! # run: |
! # curl -k "https://coveralls.io/webhook?repo_token=${COVERALLS_REPO_TOKEN}" -d "payload[build_num]=${GITHUB_RUN_ID}&payload[status]=done"

macos:
runs-on: macos-latest
--- 218,268 ----
do_test() { sg audio "sg $(id -gn) '$*'"; }
do_test make ${SHADOWOPT} ${TEST}

! # - name: Coveralls
! # if: matrix.coverage && success() && github.event_name != 'pull_request'
! # env:
! # COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
! # COVERALLS_PARALLEL: true
! # TRAVIS_JOB_ID: ${{ github.run_id }}
! # run: |
! # sudo apt-get install -y python3-setuptools python3-wheel
! # sudo -H pip3 install pip -U
! # # needed for https support for coveralls building cffi only works with gcc, not with clang
! # CC=gcc pip3 install --user cpp-coveralls pyopenssl ndg-httpsclient pyasn1
! # ~/.local/bin/coveralls -b "${SRCDIR}" -x .xs -e "${SRCDIR}"/if_perl.c -e "${SRCDIR}"/xxd -e "${SRCDIR}"/libvterm --encodings utf-8

! - name: Generate gcov files
if: matrix.coverage && success()
run: |
cd "${SRCDIR}"
! find . -type f -name '*.gcno' -exec gcov -pb {} + || true
!
! - name: Codecov
! if: matrix.coverage && success()
! uses: codecov/codecov-action@v2
! with:
! flags: ${{ matrix.features }}-${{ matrix.compiler }}-${{ matrix.extra }}

- name: ASan logs
if: contains(matrix.extra, 'asan') && !cancelled()
run: |
for f in $(grep -lR '#[[:digit:]]* *0x[[:digit:]a-fA-F]*' "${LOG_DIR}"); do
! asan_symbolize -l "$f"
false # in order to fail a job
done

! # coveralls:
! # runs-on: ubuntu-18.04
#
! # needs: linux
! # if: always() && github.event_name != 'pull_request'
#
! # steps:
! # - name: Parallel finished
! # env:
! # COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
! # run: |
! # curl -k "https://coveralls.io/webhook?repo_token=${COVERALLS_REPO_TOKEN}" -d "payload[build_num]=${GITHUB_RUN_ID}&payload[status]=done"

macos:
runs-on: macos-latest
*** ../vim-8.2.4060/src/version.c 2022-01-11 12:37:16.827153847 +0000
--- src/version.c 2022-01-11 13:03:42.971670200 +0000
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 4061,
/**/

--
Microsoft: "Windows NT 4.0 now has the same user-interface as Windows 95"
Windows 95: "Press CTRL-ALT-DEL to reboot"
Windows NT 4.0: "Press CTRL-ALT-DEL to login"

/// Bram Moolenaar -- Br...@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 ///
Reply all
Reply to author
Forward
0 new messages