Skip to content

Commit

Permalink
Merge pull request #223 from contentstack/fix/workflow
Browse files Browse the repository at this point in the history
Fix/workflow
  • Loading branch information
netrajpatel authored Sep 27, 2024
2 parents 4e3e3b1 + 3d8ac3b commit d183dc5
Show file tree
Hide file tree
Showing 4 changed files with 248 additions and 223 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/check-branch.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Check Branch'
name: "Check Branch"

on:
pull_request:
Expand All @@ -8,13 +8,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Comment PR
if: github.base_ref == 'master' && github.head_ref != 'next'
if: github.base_ref == 'master' && github.head_ref != 'staging'
uses: thollander/actions-comment-pull-request@v2
with:
message: |
We regret to inform you that you are currently not able to merge your changes into the master branch due to restrictions applied by our SRE team. To proceed with merging your changes, we kindly request that you create a pull request from the next branch. Our team will then review the changes and work with you to ensure a successful merge into the master branch.
We regret to inform you that you are currently not able to merge your changes into the master branch due to restrictions applied by our SRE team. To proceed with merging your changes, we kindly request that you create a pull request from the staging branch. Our team will then review the changes and work with you to ensure a successful merge into the master branch.
- name: Check branch
if: github.base_ref == 'master' && github.head_ref != 'next'
if: github.base_ref == 'master' && github.head_ref != 'staging'
run: |
echo "ERROR: We regret to inform you that you are currently not able to merge your changes into the master branch due to restrictions applied by our SRE team. To proceed with merging your changes, we kindly request that you create a pull request from the next branch. Our team will then review the changes and work with you to ensure a successful merge into the master branch."
echo "ERROR: We regret to inform you that you are currently not able to merge your changes into the master branch due to restrictions applied by our SRE team. To proceed with merging your changes, we kindly request that you create a pull request from the staging branch. Our team will then review the changes and work with you to ensure a successful merge into the master branch."
exit 1
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ tap-html.html
coverage
.env
.dccache
dist/*
dist/*
*.log
Loading

0 comments on commit d183dc5

Please sign in to comment.