1
0
forked from aniani/vim

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)
This commit is contained in:
Bram Moolenaar
2020-12-18 13:31:31 +01:00
parent 18f69229c5
commit b5b77378bc
3 changed files with 13 additions and 9 deletions

View File

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

View File

@@ -31,10 +31,6 @@ jobs:
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v2 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. # Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL - name: Initialize CodeQL

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 */
/**/
2156,
/**/ /**/
2155, 2155,
/**/ /**/