To: vim_dev@googlegroups.com
Subject: Patch 9.0.0946
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 9.0.0946
Problem:    CI: Error in Coverity flow is not reported.
Solution:   Use another way to avoid errors in a forked repository. (Ken
            Takata, closes #11609)
Files:      .github/workflows/coverity.yml


*** ../vim-9.0.0945/.github/workflows/coverity.yml	2022-11-24 12:01:41.767401855 +0000
--- .github/workflows/coverity.yml	2022-11-25 00:54:34.039662944 +0000
***************
*** 15,35 ****
        CC: gcc
        CFLAGS: -Wno-deprecated-declarations
        DEBIAN_FRONTEND: noninteractive
  
      steps:
        - name: Checkout repository from github
          uses: actions/checkout@v3
  
        - name: Download Coverity
          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
            mkdir cov-scan
            tar ax -f coverity_tool.tgz --strip-components=1 -C cov-scan
-         env:
-           TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
  
        - name: Install packages
          run: |
            sudo apt update && sudo apt install -y \
              autoconf \
--- 15,36 ----
        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: |
!           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
  
        - name: Install packages
+         if: env.TOKEN
          run: |
            sudo apt update && sudo apt install -y \
              autoconf \
***************
*** 48,53 ****
--- 49,55 ----
              libsodium-dev
  
        - name: Set up environment
+         if: env.TOKEN
          run: |
            echo "$(pwd)/cov-scan/bin" >> $GITHUB_PATH
            (
***************
*** 56,61 ****
--- 58,64 ----
            ) >> $GITHUB_ENV
  
        - name: Configure
+         if: env.TOKEN
          run: |
            ./configure --with-features=huge ${CONFOPT} --enable-fail-if-missing
            # Append various warning flags to CFLAGS.
***************
*** 63,83 ****
            sed -i -f ci/config.mk.${CC}.sed src/auto/config.mk
  
        - name: Build/scan vim
          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
  
        - name: Submit results
          run: |
!           [ -d 'cov-int' ] && tar zcf cov-scan.tgz cov-int
!           [ -n "${TOKEN}" ] \
!           && 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
          env:
-           TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
            EMAIL: ${{ secrets.COVERITY_SCAN_EMAIL }}
--- 66,84 ----
            sed -i -f ci/config.mk.${CC}.sed src/auto/config.mk
  
        - name: Build/scan vim
+         if: env.TOKEN
          run: |
!           cov-build --dir cov-int make -j${NPROC}
  
        - name: Submit results
+         if: env.TOKEN
          run: |
!           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'
          env:
            EMAIL: ${{ secrets.COVERITY_SCAN_EMAIL }}
*** ../vim-9.0.0945/src/version.c	2022-11-24 23:03:58.952997387 +0000
--- src/version.c	2022-11-25 00:56:48.943351216 +0000
***************
*** 697,698 ****
--- 697,700 ----
  {   /* Add new patch number below this line */
+ /**/
+     946,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
135. You cut classes or miss work so you can stay home and browse the web.

 /// 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    ///