ci: Run CI when landing to master branch
No longer run sonar or codeQL on push to master
They are auto run by the CI job
s
This commit is contained in:
parent
c630ad0952
commit
abe8146631
3 changed files with 3 additions and 6 deletions
5
.github/workflows/ci.yml
vendored
5
.github/workflows/ci.yml
vendored
|
|
@ -9,6 +9,8 @@ on:
|
||||||
inputs:
|
inputs:
|
||||||
version:
|
version:
|
||||||
description: Deskflow version number
|
description: Deskflow version number
|
||||||
|
push:
|
||||||
|
branches: [ master ]
|
||||||
pull_request:
|
pull_request:
|
||||||
types:
|
types:
|
||||||
- opened
|
- opened
|
||||||
|
|
@ -95,12 +97,11 @@ jobs:
|
||||||
|
|
||||||
analyse-codeql:
|
analyse-codeql:
|
||||||
needs: [lint-cmake, lint-clang]
|
needs: [lint-cmake, lint-clang]
|
||||||
if: ${{ github.event_name == 'pull_request' }}
|
|
||||||
uses: ./.github/workflows/codeql-analysis.yml
|
uses: ./.github/workflows/codeql-analysis.yml
|
||||||
|
|
||||||
analyse-sonarcloud:
|
analyse-sonarcloud:
|
||||||
needs: [lint-cmake, lint-clang, pr-comment-flags]
|
needs: [lint-cmake, lint-clang, pr-comment-flags]
|
||||||
if: ${{ github.event_name == 'pull_request' && needs.pr-comment-flags.outputs.no-sonar != 'true' }}
|
if: ${{ needs.pr-comment-flags.outputs.no-sonar != 'true' }}
|
||||||
uses: ./.github/workflows/sonarcloud-analysis.yml
|
uses: ./.github/workflows/sonarcloud-analysis.yml
|
||||||
secrets:
|
secrets:
|
||||||
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
|
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
|
||||||
|
|
|
||||||
2
.github/workflows/codeql-analysis.yml
vendored
2
.github/workflows/codeql-analysis.yml
vendored
|
|
@ -3,8 +3,6 @@ name: "CodeQL Analysis"
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
workflow_call:
|
workflow_call:
|
||||||
push:
|
|
||||||
branches: [master]
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
analyze:
|
analyze:
|
||||||
|
|
|
||||||
2
.github/workflows/sonarcloud-analysis.yml
vendored
2
.github/workflows/sonarcloud-analysis.yml
vendored
|
|
@ -6,8 +6,6 @@ on:
|
||||||
secrets:
|
secrets:
|
||||||
SONAR_TOKEN:
|
SONAR_TOKEN:
|
||||||
required: true
|
required: true
|
||||||
push:
|
|
||||||
branches: [master]
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
sonarcloud-analysis:
|
sonarcloud-analysis:
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue