Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions scripts/apply-develop-ruleset.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ REPO="NoiXdev/s3Manager"
DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
JSON="$DIR/develop-ruleset.json"

# --- Verify the GitHub Actions integration id in the JSON -------------------
# The bypass actor with actor_type "Integration" must be the "GitHub Actions"
# app so the release workflow's CHANGELOG push to develop is not blocked.
# 15368 is the GitHub Actions app id on github.com. If your push from the
# release workflow ever gets rejected by the ruleset, confirm the id below
# matches what the repo UI shows under:
# Settings -> Rules -> Rulesets -> protect-develop -> Bypass list -> "GitHub Actions"
# --- GitHub Actions bypass (manual, one-time) -------------------------------
# The release workflow pushes CHANGELOG.md directly to develop, which the
# `pull_request` rule blocks. The GitHub Actions bot cannot be added as a
# bypass actor via the API on a user-owned (non-org) repo, so add it once in
# the UI after running this script:
# Settings -> Rules -> Rulesets -> protect-develop -> Bypass list
# -> Add bypass -> GitHub Actions -> mode "Always" -> Save
echo "Applying ruleset to $REPO from $JSON ..."

# Create the ruleset (fails if one named 'protect-develop' already exists).
Expand Down
6 changes: 0 additions & 6 deletions scripts/develop-ruleset.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@
"actor_id": 5,
"actor_type": "RepositoryRole",
"bypass_mode": "always"
},
{
"actor_id": 15368,
"actor_type": "Integration",
"bypass_mode": "always"
}
],
"rules": [
Expand All @@ -31,7 +26,6 @@
"require_code_owner_review": false,
"require_last_push_approval": false,
"required_review_thread_resolution": false,
"automatic_copilot_code_review_enabled": false,
"allowed_merge_methods": ["merge", "squash", "rebase"]
}
},
Expand Down
Loading