Remove ignore event logic

create-pull-request.py

@@ -19,15 +19,6 @@ def get_github_event(github_event_path):
     return github_event
 
 
-def ignore_event(event_name, event_data):
-    if event_name == "push":
-        ref = "{ref}".format(**event_data)
-        if not ref.startswith('refs/heads/'):
-            print("Ignoring events for tags and remotes.")
-            return True
-    return False
-
-
 def get_head_short_sha1(repo):
     return repo.git.rev_parse('--short', 'HEAD')
 
@@ -90,10 +81,7 @@ def cs_string_to_list(str):
     return list(filter(None, l))
 
 
-def process_event(event_name, event_data, repo, branch, base, remote_exists):
+def process_event(github_token, github_repository, repo, branch, base, remote_exists):
-    # Fetch required environment variables
-    github_token = os.environ['GITHUB_TOKEN']
-    github_repository = os.environ['GITHUB_REPOSITORY']
     # Fetch optional environment variables with default values
     commit_message = os.getenv(
         'COMMIT_MESSAGE',
@@ -111,9 +99,6 @@ def process_event(event_name, event_data, repo, branch, base, remote_exists):
     pull_request_reviewers = os.environ.get('PULL_REQUEST_REVIEWERS')
     pull_request_team_reviewers = os.environ.get('PULL_REQUEST_TEAM_REVIEWERS')
 
-    # Update URL for the 'origin' remote
-    set_git_remote_url(repo.git, github_token, github_repository)
-
     # Push the local changes to the remote branch
     print("Pushing changes.")
     push_result = push_changes(repo.git, branch, commit_message)
@@ -161,72 +146,74 @@ def process_event(event_name, event_data, repo, branch, base, remote_exists):
             team_reviewers=cs_string_to_list(pull_request_team_reviewers))
 
 
-# Get the JSON event data
+# Fetch environment variables
+github_token = os.environ['GITHUB_TOKEN']
+github_repository = os.environ['GITHUB_REPOSITORY']
+github_ref = os.environ['GITHUB_REF']
 event_name = os.environ['GITHUB_EVENT_NAME']
+# Get the JSON event data
 event_data = get_github_event(os.environ['GITHUB_EVENT_PATH'])
-# Check if this event should be ignored
-skip_ignore_event = bool(os.environ.get('SKIP_IGNORE'))
-if skip_ignore_event or not ignore_event(event_name, event_data):
-    # Set the repo to the working directory
-    repo = Repo(os.getcwd())
-    # Get the default for author email and name
-    author_email, author_name = get_author_default(event_name, event_data)
-    # Set commit author overrides
-    author_email = os.getenv('COMMIT_AUTHOR_EMAIL', author_email)
-    author_name = os.getenv('COMMIT_AUTHOR_NAME', author_name)
-    # Set git configuration
-    set_git_config(repo.git, author_email, author_name)
 
-    # Fetch/Set the branch name
+# Set the repo to the working directory
-    branch_prefix = os.getenv(
+repo = Repo(os.getcwd())
+# Get the default for author email and name
+author_email, author_name = get_author_default(event_name, event_data)
+# Set commit author overrides
+author_email = os.getenv('COMMIT_AUTHOR_EMAIL', author_email)
+author_name = os.getenv('COMMIT_AUTHOR_NAME', author_name)
+# Set git configuration
+set_git_config(repo.git, author_email, author_name)
+# Update URL for the 'origin' remote
+set_git_remote_url(repo.git, github_token, github_repository)
+
+# Fetch/Set the branch name
+branch_prefix = os.getenv(
     'PULL_REQUEST_BRANCH',
     'create-pull-request/patch')
-    # Fetch the git ref
+# Fetch an optional base branch override
-    github_ref = os.environ['GITHUB_REF']
+base_override = os.environ.get('PULL_REQUEST_BASE')
-    # Fetch an optional base branch override
-    base_override = os.environ.get('PULL_REQUEST_BASE')
 
-    # Set the base branch
+# Set the base branch
-    if base_override is not None:
+if base_override is not None:
     base = base_override
     checkout_branch(repo.git, True, base)
-    elif github_ref.startswith('refs/pull/'):
+elif github_ref.startswith('refs/pull/'):
     # Switch to the merging branch instead of the merge commit
     base = os.environ['GITHUB_HEAD_REF']
     repo.git.checkout(base)
-    else:
+else:
     base = github_ref[11:]
 
-    # Skip if the current branch is a PR branch created by this action.
+# Skip if the current branch is a PR branch created by this action.
-    # This may occur when using a PAT instead of GITHUB_TOKEN.
+# This may occur when using a PAT instead of GITHUB_TOKEN.
-    if base.startswith(branch_prefix):
+if base.startswith(branch_prefix):
     print("Branch '%s' was created by this action. Skipping." % base)
     sys.exit()
 
-    # Fetch an optional environment variable to determine the branch suffix
+# Fetch an optional environment variable to determine the branch suffix
-    branch_suffix = os.getenv('BRANCH_SUFFIX', 'short-commit-hash')
+branch_suffix = os.getenv('BRANCH_SUFFIX', 'short-commit-hash')
-    if branch_suffix == "short-commit-hash":
+if branch_suffix == "short-commit-hash":
     # Suffix with the short SHA1 hash
     branch = "%s-%s" % (branch_prefix, get_head_short_sha1(repo))
-    elif branch_suffix == "timestamp":
+elif branch_suffix == "timestamp":
     # Suffix with the current timestamp
     branch = "%s-%s" % (branch_prefix, int(time.time()))
-    elif branch_suffix == "random":
+elif branch_suffix == "random":
     # Suffix with the current timestamp
     branch = "%s-%s" % (branch_prefix, get_random_suffix())
-    elif branch_suffix == "none":
+elif branch_suffix == "none":
     # Fixed branch name
     branch = branch_prefix
-    else:
+else:
     print(
         "Branch suffix '%s' is not a valid value." %
         branch_suffix)
     sys.exit(1)
 
-    # Check if the remote branch exists
+# Check if the remote branch exists
-    remote_exists = remote_branch_exists(repo, branch)
+remote_exists = remote_branch_exists(repo, branch)
 
-    if remote_exists:
+if remote_exists:
     if branch_suffix == 'short-commit-hash':
         # A remote branch already exists for the HEAD commit
         print(
@@ -240,18 +227,18 @@ if skip_ignore_event or not ignore_event(event_name, event_data):
             branch)
         sys.exit(1)
 
-    # Checkout branch
+# Checkout branch
-    checkout_branch(repo.git, remote_exists, branch)
+checkout_branch(repo.git, remote_exists, branch)
 
-    # Check if there are changes to pull request
+# Check if there are changes to pull request
-    if repo.is_dirty() or len(repo.untracked_files) > 0:
+if repo.is_dirty() or len(repo.untracked_files) > 0:
     print("Repository has modified or untracked files.")
     process_event(
-            event_name,
+        github_token,
-            event_data,
+        github_repository,
         repo,
         branch,
         base,
         remote_exists)
-    else:
+else:
     print("Repository has no modified or untracked files. Skipping.")