Skip to content

Added main branch protection #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
panchi64 merged 7 commits into from
Jul 5, 2025
Merged

Added main branch protection #5

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3075cff
Created the linting rules for the project
panchi64 Jun 26, 2025
9eae122
Added path aliasing
panchi64 Jun 26, 2025
65c2a36
Added the merge protection github action.
panchi64 Jul 5, 2025
717935f
Addressed the multiline syntax Copilot highlighted
panchi64 Jul 5, 2025
ef08f89
Merge pull request #1 from Daemon-Computer/feat/branch-merging-protec…
panchi64 Jul 5, 2025
53498db
Removed unnecessary label and emoji + main branch protection(#4)
panchi64 Jul 5, 2025
0092df4
Merge branch 'main' into dev
panchi64 Jul 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions .github/workflows/merge_protection.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,25 @@ jobs:
echo "Base branch: ${{ github.base_ref }}"
echo "Head branch: ${{ github.head_ref }}"

# Check main protection
if [[ "${{ github.base_ref }}" == "main" && "${{ github.head_ref }}" != "dev" ]]; then
echo "violation=testnet" >> $GITHUB_OUTPUT
{
echo 'message<<EOF'
echo "❌ **Branch Protection Violation**"
echo ""
echo "You are trying to merge from \`${{ github.head_ref }}\` to \`main\`, but our branch protection rules only allow merges from \`dev\` to \`main\`."
echo ""
echo "**Correct workflow:**"
echo "1. Merge your changes to \`dev\` first"
echo "2. Then create a PR from \`dev\` to \`main\`"
echo ""
echo "This ensures proper code flow and testing procedures."
echo 'EOF'
} >> $GITHUB_OUTPUT
exit 1
fi

# Check testnet protection
if [[ "${{ github.base_ref }}" == "testnet" && "${{ github.head_ref }}" != "main" ]]; then
echo "violation=testnet" >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -106,7 +125,7 @@ jobs:
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.issue.number,
labels: ['branch-protection-violation', 'needs-attention']
labels: ['branch-protection-violation']
});

- name: Optional - Auto-close PR
Expand All @@ -125,5 +144,5 @@ jobs:
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.issue.number,
body: '🔒 This PR has been automatically closed due to branch protection rules. Please follow the correct workflow and create a new PR.'
body: 'This PR has been automatically closed due to branch protection rules. Please follow the correct workflow and create a new PR.'
});