patch 8.2.2156: Github actions run on pusing a tag

Problem:    Github actions run on pusing a tag.
Solution:   Don't run CI on tag push. Omit coveralls on pull-request.
            (Ozaki Kiichi, closes #7489)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 758da09b67439ec126c37a09e339c2cb0631fe7b..b6dd144fbb18c6b1a179857673b82f15935d703e 100644 (file)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,6 +1,9 @@
 name: GitHub CI
 
-on: [push, pull_request]
+on:
+  push:
+    branches: ['**']
+  pull_request:
 
 jobs:
   linux:
@@ -197,7 +200,7 @@ jobs:
           do_test make ${SHADOWOPT} ${TEST}
 
       - name: Coveralls
-        if: matrix.coverage && success()
+        if: matrix.coverage && success() && github.event_name != 'pull_request'
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
           COVERALLS_PARALLEL: true
@@ -210,8 +213,11 @@ jobs:
 
       - name: Codecov
         if: matrix.coverage && success()
-        run: |
-          cd "${SRCDIR}" && bash <(curl -s https://codecov.io/bash)
+        uses: codecov/codecov-action@v1
+        with:
+          flags: ${{ matrix.features }}-${{ matrix.compiler }}-${{ matrix.extra }}
+          fail_ci_if_error: true
+          working-directory: ${{ env.SRCDIR }}
 
       - name: ASan logs
         if: contains(matrix.extra, 'asan') && !cancelled()
@@ -225,7 +231,7 @@ jobs:
     runs-on: ubuntu-latest
 
     needs: linux
-    if: always()
+    if: github.event_name != 'pull_request'
 
     steps:
       - name: Parallel finished

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 647c799d67a11f4bfef4456d87a42badc03494c9..ef98000f8997e280cae89956c210ce8e939d7422 100644 (file)
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -31,10 +31,6 @@ jobs:
     steps:
     - name: Checkout repository
       uses: actions/checkout@v2
-      with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
-        fetch-depth: 2
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

diff --git a/src/version.c b/src/version.c
index 7a76d06f0cd59a038684d32417e68f79c4e70c56..be2b33c19d934c77ceed8cf9e5e5a202a6d58718 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2156,
 /**/
     2155,
 /**/