patch 9.0.0946: CI: Error in Coverity flow is not reported

Problem:    CI: Error in Coverity flow is not reported.
Solution:   Use another way to avoid errors in a forked repository. (Ken
            Takata, closes #11609)

diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
index 5c43b2cbcf86f5c5d48fb694d42b628412056d0b..e399170f6477a76a65ff1fc1e4795842f63744b8 100644 (file)
--- a/.github/workflows/coverity.yml
+++ b/.github/workflows/coverity.yml
@@ -15,21 +15,22 @@ jobs:
       CC: gcc
       CFLAGS: -Wno-deprecated-declarations
       DEBIAN_FRONTEND: noninteractive
+      TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
 
     steps:
       - name: Checkout repository from github
+        if: env.TOKEN
         uses: actions/checkout@v3
 
       - name: Download Coverity
+        if: env.TOKEN
         run: |
-          # probably no TOKEN if it was a forked repo
-          [ -n "${TOKEN}" ] && wget -q https://scan.coverity.com/download/cxx/linux64 --post-data "token=$TOKEN&project=vim" -O coverity_tool.tgz || exit 0
+          wget -q https://scan.coverity.com/download/cxx/linux64 --post-data "token=$TOKEN&project=vim" -O coverity_tool.tgz
           mkdir cov-scan
           tar ax -f coverity_tool.tgz --strip-components=1 -C cov-scan
-        env:
-          TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
 
       - name: Install packages
+        if: env.TOKEN
         run: |
           sudo apt update && sudo apt install -y \
             autoconf \
@@ -48,6 +49,7 @@ jobs:
             libsodium-dev
 
       - name: Set up environment
+        if: env.TOKEN
         run: |
           echo "$(pwd)/cov-scan/bin" >> $GITHUB_PATH
           (
@@ -56,6 +58,7 @@ jobs:
           ) >> $GITHUB_ENV
 
       - name: Configure
+        if: env.TOKEN
         run: |
           ./configure --with-features=huge ${CONFOPT} --enable-fail-if-missing
           # Append various warning flags to CFLAGS.
@@ -63,21 +66,19 @@ jobs:
           sed -i -f ci/config.mk.${CC}.sed src/auto/config.mk
 
       - name: Build/scan vim
+        if: env.TOKEN
         run: |
-          # if no 'cov-build' there, then just cancel the process
-          [ -x "$(which cov-build)" ] && cov-build --dir cov-int make -j${NPROC} || exit 0
+          cov-build --dir cov-int make -j${NPROC}
 
       - name: Submit results
+        if: env.TOKEN
         run: |
-          [ -d 'cov-int' ] && tar zcf cov-scan.tgz cov-int
-          [ -n "${TOKEN}" ] \
-          && curl --form token=$TOKEN \
+          tar zcf cov-scan.tgz cov-int
+          curl --form token=$TOKEN \
             --form email=$EMAIL \
             --form file=@cov-scan.tgz \
             --form version="$(git rev-parse HEAD)" \
             --form description="Automatic GHA scan" \
-            'https://scan.coverity.com/builds?project=vim' \
-          || exit 0
+            'https://scan.coverity.com/builds?project=vim'
         env:
-          TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
           EMAIL: ${{ secrets.COVERITY_SCAN_EMAIL }}

diff --git a/src/version.c b/src/version.c
index 875252892085a733e7e03e6684ae47f61cad43d9..0c3194c05dc1d50b3dad5d21e58ca9fbbeb53909 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    946,
 /**/
     945,
 /**/