Skip to content

Commit 8bcabbe

Browse files
committed
PPHA-369: Add merged event to build stage of pr workflow
1 parent 0d4ebfd commit 8bcabbe

File tree

2 files changed

+5
-82
lines changed

2 files changed

+5
-82
lines changed

.github/workflows/cicd-1-pull-request.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@ name: "CI/CD pull request"
33
# The total recommended execution time for the "CI/CD Pull Request" workflow is around 20 minutes.
44

55
on:
6+
push:
7+
branches:
8+
- "**"
69
pull_request:
7-
types: [opened, reopened]
10+
types: [opened, reopened, merged]
811

912
jobs:
1013
metadata:
@@ -93,7 +96,7 @@ jobs:
9396
name: "Build stage"
9497
needs: [metadata, test-stage]
9598
uses: ./.github/workflows/stage-3-build.yaml
96-
if: needs.metadata.outputs.does_pull_request_exist == 'true' || (github.event_name == 'pull_request' && (github.event.action == 'opened' || github.event.action == 'reopened'))
99+
if: needs.metadata.outputs.does_pull_request_exist == 'true' || (github.event_name == 'pull_request' && (github.event.action == 'opened' || github.event.action == 'reopened' || github.event.action == 'merged'))
97100
with:
98101
build_datetime: "${{ needs.metadata.outputs.build_datetime }}"
99102
build_timestamp: "${{ needs.metadata.outputs.build_timestamp }}"

.github/workflows/cicd-4-main-branch.yml

Lines changed: 0 additions & 80 deletions
This file was deleted.

0 commit comments

Comments
 (0)