diff --git a/conventional_commits/.gitlab-ci.yml b/conventional_commits/.gitlab-ci.yml index e9d085c..8c4c10c 100644 --- a/conventional_commits/.gitlab-ci.yml +++ b/conventional_commits/.gitlab-ci.yml @@ -22,7 +22,6 @@ - pip install -r $ROOT_DIR/conventional_commits/requirements.txt - echo "[DEBUG] CI_PROJECT_ID[$CI_PROJECT_ID]" - echo "[DEBUG] CI_COMMIT_BRANCH[$CI_COMMIT_BRANCH]" - - $ROOT_DIR/conventional_commits/scripts/commit.py --token "$MR_ACCESS_TOKEN" --project $PROJECT_ID --branch $CI_COMMIT_BRANCH --target-branch - git checkout --track origin/$CI_COMMIT_BRANCH - git show-branch -a - target_branch=$(git show-branch -a | awk 'BEGIN { FS="\n\s+*" } { print $1 }' | awk '{print $2}' | grep '\[' | sed 's/.*\[origin\/\(.*\)\].*/\1/' | grep -v '\[' | grep -v $(git rev-parse --abbrev-ref HEAD) | grep -vi 'HEAD' | awk 'BEGIN{ RS = "" ; FS = "\n" }{print $1}') diff --git a/conventional_commits/scripts/commit.py b/conventional_commits/scripts/commit.py index 1379a5f..2f736c2 100755 --- a/conventional_commits/scripts/commit.py +++ b/conventional_commits/scripts/commit.py @@ -9,13 +9,11 @@ import getopt import json import requests -get_first_commit = False get_mr_title = False -get_target_branch = False project_id = '' try: - opts, args = getopt.getopt(sys.argv[1:],"hic:t:ti:p:b:o",["commit","token=", "title", "project=", "branch=", "target-branch"]) + opts, args = getopt.getopt(sys.argv[1:],"hi:t:ti:p:b",["token=", "title", "project=", "branch=""]) except getopt.GetoptError: print('test.py [-c | --commit] [-t | --token {token}]') @@ -27,8 +25,6 @@ for opt, arg in opts: if opt == '-h': print('[commit.py] -i -o ') sys.exit() - elif opt in ("-c", "--commit"): - get_first_commit = True elif opt in ("-t", "--token"): ci_job_token = arg elif opt in ("-ti", "--title"): @@ -37,8 +33,7 @@ for opt, arg in opts: project_id = str(arg) elif opt in ("-b", "--branch"): git_branch = arg - elif opt in ("-o", "--target-branch"): - get_target_branch = True + # private token or personal token authentication #gl = gitlab.Gitlab('https://gitlab.com', private_token=ci_job_token) @@ -79,21 +74,9 @@ for mr in merge_requests: if mr['source_branch'] == git_branch and str(mr['target_project_id']) == str(project_id) and str(mr['state']) == 'opened': mr_title = mr['title'] - mr_first_commit = mr['sha'] - target_branch = mr['target_branch'] - -if get_target_branch: - print('{0}'.format(target_branch)) - - -if get_first_commit: - - print('{0}'.format(mr_first_commit)) - - if get_mr_title: print('{0}'.format(mr_title))