From 46b300775fddb00ce280e4884a9ccade9eb64166 Mon Sep 17 00:00:00 2001 From: Matthias Dellweg Date: Fri, 6 Sep 2024 13:56:34 +0200 Subject: [PATCH] WIP Remove [noissue] mechanics --- .ci/bootstrap_catdog.sh | 2 +- README.md | 2 -- plugin-template | 1 - scripts/update_ci.sh | 11 +++-------- templates/github/.ci/scripts/collect_changes.py.j2 | 2 +- .../github/.ci/scripts/validate_commit_message.py.j2 | 11 ----------- .../github/.github/workflows/create-branch.yml.j2 | 2 -- templates/github/.github/workflows/update_ci.yml.j2 | 6 +----- 8 files changed, 6 insertions(+), 31 deletions(-) diff --git a/.ci/bootstrap_catdog.sh b/.ci/bootstrap_catdog.sh index 21779f76..88d651c3 100755 --- a/.ci/bootstrap_catdog.sh +++ b/.ci/bootstrap_catdog.sh @@ -7,7 +7,7 @@ if [ "$GITHUB_EVENT_NAME" = "pull_request" ] then COMMIT_MSG=$(git log --format=%B -n 1 HEAD^2) else - COMMIT_MSG="Initial commit\n\n[noissue]" + COMMIT_MSG="Initial commit" fi echo "${COMMIT_MSG}" diff --git a/README.md b/README.md index 5dd2155d..3e5bad37 100644 --- a/README.md +++ b/README.md @@ -133,8 +133,6 @@ The following settings are stored in `template_config.yml`. the CI will run an additional pytest call running pulpcore tests with that mark. - noissue_marker A string that is used to mark a commit as not attached to an issue. - stalebot A boolean that indicates whether to use stalebot or not. stalebot_days_until_stale diff --git a/plugin-template b/plugin-template index ea33caf3..da4342fd 100755 --- a/plugin-template +++ b/plugin-template @@ -40,7 +40,6 @@ DEFAULT_SETTINGS = { "github_org": "pulp", "latest_release_branch": None, "lint_requirements": True, - "noissue_marker": "[noissue]", "os_required_packages": [], "parallel_test_workers": 8, "plugin_app_label": None, diff --git a/scripts/update_ci.sh b/scripts/update_ci.sh index d9ae7714..3926f86c 100755 --- a/scripts/update_ci.sh +++ b/scripts/update_ci.sh @@ -20,13 +20,8 @@ fi plugin_name="$(python ../plugin_template/scripts/get_template_config_value.py plugin_name)" ci_update_docs="$(python ../plugin_template/scripts/get_template_config_value.py ci_update_docs)" -noissue_marker="$(python ../plugin_template/scripts/get_template_config_value.py noissue_marker)" use_black="$(python ../plugin_template/scripts/get_template_config_value.py black)" -if [[ -z "${noissue_marker}" ]]; then - noissue_marker="[noissue]" -fi - if [[ "${ci_update_docs}" == "True" ]]; then docs=("--docs") else @@ -46,7 +41,7 @@ fi if [[ $(git status --porcelain) ]]; then git add -A - git commit -m "Update CI files" -m "${noissue_marker}" + git commit -m "Update CI files" else echo "No updates needed" fi @@ -59,7 +54,7 @@ then if [[ "$(git status --porcelain)" ]] then git add -A - git commit -m "Reformat with black" -m "${noissue_marker}" + git commit -m "Reformat with black" else echo "No formatting change needed" fi @@ -70,6 +65,6 @@ if [[ "$plugin_name" != "pulpcore" ]]; then python ../plugin_template/scripts/update_core_lowerbound.py if [[ $(git status --porcelain) ]]; then git add -A - git commit -m "Bump pulpcore lowerbounds to supported branch" -m "$noissue_marker" + git commit -m "Bump pulpcore lowerbounds to supported branch" fi fi diff --git a/templates/github/.ci/scripts/collect_changes.py.j2 b/templates/github/.ci/scripts/collect_changes.py.j2 index 3983565c..fa9d46af 100755 --- a/templates/github/.ci/scripts/collect_changes.py.j2 +++ b/templates/github/.ci/scripts/collect_changes.py.j2 @@ -98,7 +98,7 @@ def main(): for change in main_changes: fp.write(change[1]) - repo.git.commit("-m", "Update Changelog", "-m" "{{ noissue_marker | default("[noissue]") }}", CHANGELOG_FILE) + repo.git.commit("-m", "Update Changelog", CHANGELOG_FILE) if __name__ == "__main__": diff --git a/templates/github/.ci/scripts/validate_commit_message.py.j2 b/templates/github/.ci/scripts/validate_commit_message.py.j2 index 34936588..38e92e37 100644 --- a/templates/github/.ci/scripts/validate_commit_message.py.j2 +++ b/templates/github/.ci/scripts/validate_commit_message.py.j2 @@ -8,7 +8,6 @@ import os import warnings from github import Github -NO_ISSUE = "[noissue]" CHANGELOG_EXTS = [".feature", ".bugfix", ".doc", ".removal", ".misc", ".deprecation"] KEYWORDS = ["fixes", "closes"] @@ -55,15 +54,5 @@ if issues: for issue in pattern.findall(message): __check_status(issue) __check_changelog(issue) -else: - if NO_ISSUE in message: - print("Commit {sha} has no issues but is tagged {tag}.".format(sha=sha[0:7], tag=NO_ISSUE)) - elif "Merge" in message and "cherry picked from commit" in message: - pass - else: - sys.exit( - "Error: no attached issues found for {sha}. If this was intentional, add " - " '{tag}' to the commit message.".format(sha=sha[0:7], tag=NO_ISSUE) - ) print("Commit message for {sha} passed.".format(sha=sha[0:7])) diff --git a/templates/github/.github/workflows/create-branch.yml.j2 b/templates/github/.github/workflows/create-branch.yml.j2 index 80928cbf..d9019def 100644 --- a/templates/github/.github/workflows/create-branch.yml.j2 +++ b/templates/github/.github/workflows/create-branch.yml.j2 @@ -75,10 +75,8 @@ jobs: branch: minor-version-bump base: {{ plugin_default_branch }} title: Bump minor version - body: '[noissue]' commit-message: | Bump minor version - [noissue] delete-branch: true - name: Push release branch diff --git a/templates/github/.github/workflows/update_ci.yml.j2 b/templates/github/.github/workflows/update_ci.yml.j2 index 400e97ae..2cd84c2a 100644 --- a/templates/github/.github/workflows/update_ci.yml.j2 +++ b/templates/github/.github/workflows/update_ci.yml.j2 @@ -49,12 +49,8 @@ jobs: committer: "{{ release_user }} <{{ release_email }}>" author: "{{ release_user }} <{{ release_email }}>" title: "Update CI files for branch {{ branch }}" - body: "" branch: "update-ci/{{ branch }}" base: "{{ branch }}" - commit-message: | - Update CI files - - {{ noissue_marker }} delete-branch: true {%- endfor %} +...