Skip to content

Commit 20e492c

Browse files
committed
chore: update yaml workflow
Signed-off-by: Jeremy Andrews <[email protected]>
1 parent eb24312 commit 20e492c

File tree

2 files changed

+4
-85
lines changed

2 files changed

+4
-85
lines changed

.github/workflows/beta-workflow.yml

-78
This file was deleted.

.github/workflows/parent-pipeline.yml

+4-7
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,8 @@ jobs:
4444
# github.event_name == 'push' &&
4545
# needs.determine-workflow.outputs.branch_name != 'main' &&
4646
# needs.determine-workflow.outputs.branch_name != 'qa' &&
47-
<<<<<<< HEAD
48-
# needs.determine-workflow.outputs.branch_name != 'development'
49-
=======
5047
# needs.determine-workflow.outputs.branch_name != 'beta'
51-
>>>>>>> 83b6438 (feat: release v.0.0.1-pre+1 (#25))
48+
>>>>>>> 83b6438 (feat: release v.0.0.1-pre+1 (#25))
5249
# uses: ./.github/workflows/contributor-workflow.yml
5350
# with:
5451
# branch_name: ${{ needs.determine-workflow.outputs.branch_name }}
@@ -65,23 +62,23 @@ jobs:
6562
# branch_name: ${{ needs.determine-workflow.outputs.branch_name }}
6663
# event_name: ${{ needs.determine-workflow.outputs.event_name }}
6764

68-
<<<<<<< HEAD
65+
<<<<<<< HEAD
6966
# trigger-development-workflow:
7067
# name: Trigger Development Workflow
7168
# needs: trigger-validation
7269
# if: |
7370
# github.event_name == 'pull_request' &&
7471
# github.base_ref == 'development'
7572
# uses: ./.github/workflows/development-workflow.yml
76-
=======
73+
=======
7774
# trigger-beta-workflow:
7875
# name: Trigger Beta Workflow
7976
# needs: trigger-validation
8077
# if: |
8178
# github.event_name == 'pull_request' &&
8279
# github.base_ref == 'beta'
8380
# uses: ./.github/workflows/beta-workflow.yml
84-
>>>>>>> 83b6438 (feat: release v.0.0.1-pre+1 (#25))
81+
>>>>>>> 83b6438 (feat: release v.0.0.1-pre+1 (#25))
8582
# with:
8683
# branch_name: ${{ needs.determine-workflow.outputs.branch_name }}
8784
# event_name: ${{ needs.determine-workflow.outputs.event_name }}

0 commit comments

Comments
 (0)