Skip to content

Commit b5b7737

Browse files
committed
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)
1 parent 18f6922 commit b5b7737

3 files changed

Lines changed: 13 additions & 9 deletions

File tree

.github/workflows/ci.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
name: GitHub CI
22

3-
on: [push, pull_request]
3+
on:
4+
push:
5+
branches: ['**']
6+
pull_request:
47

58
jobs:
69
linux:
@@ -197,7 +200,7 @@ jobs:
197200
do_test make ${SHADOWOPT} ${TEST}
198201
199202
- name: Coveralls
200-
if: matrix.coverage && success()
203+
if: matrix.coverage && success() && github.event_name != 'pull_request'
201204
env:
202205
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
203206
COVERALLS_PARALLEL: true
@@ -210,8 +213,11 @@ jobs:
210213
211214
- name: Codecov
212215
if: matrix.coverage && success()
213-
run: |
214-
cd "${SRCDIR}" && bash <(curl -s https://codecov.io/bash)
216+
uses: codecov/codecov-action@v1
217+
with:
218+
flags: ${{ matrix.features }}-${{ matrix.compiler }}-${{ matrix.extra }}
219+
fail_ci_if_error: true
220+
working-directory: ${{ env.SRCDIR }}
215221

216222
- name: ASan logs
217223
if: contains(matrix.extra, 'asan') && !cancelled()
@@ -225,7 +231,7 @@ jobs:
225231
runs-on: ubuntu-latest
226232

227233
needs: linux
228-
if: always()
234+
if: github.event_name != 'pull_request'
229235

230236
steps:
231237
- name: Parallel finished

.github/workflows/codeql-analysis.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ jobs:
3131
steps:
3232
- name: Checkout repository
3333
uses: actions/checkout@v2
34-
with:
35-
# We must fetch at least the immediate parents so that if this is
36-
# a pull request then we can checkout the head.
37-
fetch-depth: 2
3834

3935
# Initializes the CodeQL tools for scanning.
4036
- name: Initialize CodeQL

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -750,6 +750,8 @@ static char *(features[]) =
750750

751751
static int included_patches[] =
752752
{ /* Add new patch number below this line */
753+
/**/
754+
2156,
753755
/**/
754756
2155,
755757
/**/

0 commit comments

Comments
 (0)