Skip to content

Commit 1784856

Browse files
committed
homogenize workflow with pgm
Signed-off-by: Nitish Bharambe <[email protected]>
1 parent 54e3dbd commit 1784856

File tree

5 files changed

+21
-32
lines changed

5 files changed

+21
-32
lines changed

.github/workflows/build-test-release.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@
66
name: Build, Test, Sonar
77

88
on:
9-
push:
10-
branches:
11-
- main
12-
# run pipeline on pull request
13-
pull_request:
14-
# run pipeline on merge queue
15-
merge_group:
169
# run pipeline from another workflow
1710
workflow_call:
1811
inputs:
@@ -207,7 +200,7 @@ jobs:
207200
run: echo "${{ steps.tag.outputs.tag }}"
208201

209202
- name: Create GitHub release
210-
if: (github.event_name == 'push') || ((github.event_name == 'workflow_dispatch') && (github.event.inputs.create_release == 'true'))
203+
if: (inputs.create_release)
211204
uses: softprops/action-gh-release@v2
212205
with:
213206
files: |

.github/workflows/check-code-quality.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@
66
name: Check Code Quality
77

88
on:
9-
push:
10-
branches:
11-
- main
12-
# run pipeline on pull request
13-
pull_request:
14-
# run pipeline on merge queue
15-
merge_group:
169
# run pipeline from another workflow
1710
workflow_call:
1811

.github/workflows/ci.yml

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# SPDX-License-Identifier: MPL-2.0
44

55

6-
name: Build, Test, Sonar and Publish
6+
name: CI Build
77

88
on:
99
push:
@@ -13,14 +13,6 @@ on:
1313
pull_request:
1414
# run pipeline on merge queue
1515
merge_group:
16-
# run pipeline from another workflow
17-
workflow_call:
18-
inputs:
19-
create_release:
20-
type: boolean
21-
description: Create a (pre-)release when CI passes
22-
default: false
23-
required: false
2416
# run this workflow manually from the Actions tab
2517
workflow_dispatch:
2618
inputs:
@@ -35,6 +27,11 @@ concurrency:
3527
cancel-in-progress: true
3628

3729
jobs:
30+
ci-started:
31+
runs-on: ubuntu-latest
32+
steps:
33+
- run: echo "ci started"
34+
3835
build-test-release:
3936
name: build-test-release
4037
uses: "./.github/workflows/build-test-release.yml"
@@ -46,6 +43,19 @@ jobs:
4643
# otherwise create_release becomes false
4744
create_release: ${{ (github.event_name == 'workflow_dispatch' && inputs.create_release) || github.event_name == 'push'}}
4845

46+
check-code-quality:
47+
uses: "./.github/workflows/check-code-quality.yml"
48+
49+
reuse-compliance:
50+
uses: "./.github/workflows/reuse-compliance.yml"
51+
52+
ci-passed:
53+
runs-on: ubuntu-latest
54+
needs: [ci-started, build-test-release, check-code-quality, reuse-compliance]
55+
56+
steps:
57+
- run: echo "ci passed"
58+
4959
publish:
5060
name: Publish to PyPI
5161
runs-on: ubuntu-latest

.github/workflows/nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ concurrency:
1515
cancel-in-progress: true
1616

1717
jobs:
18-
main:
18+
build-test-release:
1919
uses: "./.github/workflows/build-test-release.yml"
2020
permissions:
2121
contents: write

.github/workflows/reuse-compliance.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@
66
name: REUSE Compliance Check
77

88
on:
9-
push:
10-
branches:
11-
- main
12-
# run pipeline on pull request
13-
pull_request:
14-
# run pipeline on merge queue
15-
merge_group:
169
# run pipeline from another workflow
1710
workflow_call:
1811
# run this workflow manually from the Actions tab

0 commit comments

Comments
 (0)