44
44
# github.event_name == 'push' &&
45
45
# needs.determine-workflow.outputs.branch_name != 'main' &&
46
46
# needs.determine-workflow.outputs.branch_name != 'qa' &&
47
- <<<<<<< HEAD
48
- # needs.determine-workflow.outputs.branch_name != 'development'
49
- =======
50
47
# 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))
52
49
# uses: ./.github/workflows/contributor-workflow.yml
53
50
# with:
54
51
# branch_name: ${{ needs.determine-workflow.outputs.branch_name }}
@@ -65,23 +62,23 @@ jobs:
65
62
# branch_name: ${{ needs.determine-workflow.outputs.branch_name }}
66
63
# event_name: ${{ needs.determine-workflow.outputs.event_name }}
67
64
68
- <<<<<<< HEAD
65
+ <<<<<<< HEAD
69
66
# trigger-development-workflow:
70
67
# name: Trigger Development Workflow
71
68
# needs: trigger-validation
72
69
# if: |
73
70
# github.event_name == 'pull_request' &&
74
71
# github.base_ref == 'development'
75
72
# uses: ./.github/workflows/development-workflow.yml
76
- =======
73
+ =======
77
74
# trigger-beta-workflow:
78
75
# name: Trigger Beta Workflow
79
76
# needs: trigger-validation
80
77
# if: |
81
78
# github.event_name == 'pull_request' &&
82
79
# github.base_ref == 'beta'
83
80
# 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))
85
82
# with:
86
83
# branch_name: ${{ needs.determine-workflow.outputs.branch_name }}
87
84
# event_name: ${{ needs.determine-workflow.outputs.event_name }}
0 commit comments