adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 8.2.4061: codecov bash script is deprecated

Browse Source 
Problem:    Codecov bash script is deprecated.
Solution:   Use the codecov action. (Ozaki Kiichi, closes #9505)
This commit is contained in:
ichizok
2022-01-11 13:05:26 +00:00
committed by Bram Moolenaar
parent d6f27c66cc
commit 0d47ad4027
2 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
.github/workflows/ci.yml vendored
View File

@ -92,6 +92,7 @@ jobs:
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-13 100 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 --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/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 - name: Set up environment
run: | run: |
@ -119,7 +120,6 @@ jobs:
;; ;;
esac esac
CFLAGS=""
if ${{ matrix.coverage == true }}; then if ${{ matrix.coverage == true }}; then
CFLAGS="$CFLAGS --coverage -DUSE_GCOV_FLUSH" CFLAGS="$CFLAGS --coverage -DUSE_GCOV_FLUSH"
echo "LDFLAGS=--coverage" echo "LDFLAGS=--coverage"
@ -218,45 +218,51 @@ jobs:
do_test() { sg audio "sg $(id -gn) '$*'"; } do_test() { sg audio "sg $(id -gn) '$*'"; }
do_test make ${SHADOWOPT} ${TEST} do_test make ${SHADOWOPT} ${TEST}
# - name: Coveralls # - name: Coveralls
# if: matrix.coverage && success() && github.event_name != 'pull_request' # if: matrix.coverage && success() && github.event_name != 'pull_request'
# env: # env:
# COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} # COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
# COVERALLS_PARALLEL: true # COVERALLS_PARALLEL: true
# TRAVIS_JOB_ID: ${{ github.run_id }} # TRAVIS_JOB_ID: ${{ github.run_id }}
# run: | # run: |
# sudo apt-get install -y python3-setuptools python3-wheel # sudo apt-get install -y python3-setuptools python3-wheel
# sudo -H pip3 install pip -U # sudo -H pip3 install pip -U
# # needed for https support for coveralls building cffi only works with gcc, not with clang # # 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 # 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 # ~/.local/bin/coveralls -b "${SRCDIR}" -x .xs -e "${SRCDIR}"/if_perl.c -e "${SRCDIR}"/xxd -e "${SRCDIR}"/libvterm --encodings utf-8
- name: Codecov - name: Generate gcov files
if: matrix.coverage && success() if: matrix.coverage && success()
run: | run: |
cd "${SRCDIR}" cd "${SRCDIR}"
bash <(curl -s https://codecov.io/bash) -F "${{ matrix.features }}-${{ matrix.compiler }}-${{ matrix.extra }}" 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 - name: ASan logs
if: contains(matrix.extra, 'asan') && !cancelled() if: contains(matrix.extra, 'asan') && !cancelled()
run: | run: |
for f in $(grep -lR '#[[:digit:]]* *0x[[:digit:]a-fA-F]*' "${LOG_DIR}"); do for f in $(grep -lR '#[[:digit:]]* *0x[[:digit:]a-fA-F]*' "${LOG_DIR}"); do
asan_symbolize-13 -l "$f" asan_symbolize -l "$f"
false # in order to fail a job false # in order to fail a job
done done
# coveralls: # coveralls:
# runs-on: ubuntu-18.04 # runs-on: ubuntu-18.04
# #
# needs: linux # needs: linux
# if: always() && github.event_name != 'pull_request' # if: always() && github.event_name != 'pull_request'
# #
# steps: # steps:
# - name: Parallel finished # - name: Parallel finished
# env: # env:
# COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} # COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
# run: | # run: |
# curl -k "https://coveralls.io/webhook?repo_token=${COVERALLS_REPO_TOKEN}" -d "payload[build_num]=${GITHUB_RUN_ID}&payload[status]=done" # curl -k "https://coveralls.io/webhook?repo_token=${COVERALLS_REPO_TOKEN}" -d "payload[build_num]=${GITHUB_RUN_ID}&payload[status]=done"
macos: macos:
runs-on: macos-latest runs-on: macos-latest

2
src/version.c
View File

@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
4061,
/**/ /**/
4060, 4060,
/**/ /**/