From 9500b9d2e97c30b6a33e788cc44f6faac305d489 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 9 Jun 2021 12:47:22 +0200 Subject: [PATCH] gradle-release-checksums.py: check for GitLab token before committing --- tests/gradle-release-checksums.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/gradle-release-checksums.py b/tests/gradle-release-checksums.py index 9f895426..35b2d99f 100755 --- a/tests/gradle-release-checksums.py +++ b/tests/gradle-release-checksums.py @@ -95,6 +95,13 @@ if os.getenv('CI_PROJECT_NAMESPACE') != 'fdroid': git_repo = git.repo.Repo('.') modified = git_repo.git().ls_files(modified=True).split() if git_repo.is_dirty() and ('gradlew-fdroid' in modified or 'makebuildserver' in modified): + private_token = os.getenv('PERSONAL_ACCESS_TOKEN') + if not private_token: + print(Fore.RED + + 'ERROR: GitLab Token not found in PERSONAL_ACCESS_TOKEN!' + + Style.RESET_ALL) + exit(1) + branch = git_repo.create_head(os.path.basename(__file__), force=True) branch.checkout() git_repo.index.add(['gradlew-fdroid', 'makebuildserver']) @@ -112,12 +119,6 @@ if git_repo.is_dirty() and ('gradlew-fdroid' in modified or 'makebuildserver' in remote.push(force=True) git.remote.Remote.rm(git_repo, remote_name) - private_token = os.getenv('PERSONAL_ACCESS_TOKEN') - if not private_token: - print(Fore.RED - + 'ERROR: GitLab Token not found in PERSONAL_ACCESS_TOKEN!' - + Style.RESET_ALL) - exit(1) gl = gitlab.Gitlab(os.getenv('CI_SERVER_URL'), api_version=4, private_token=private_token) project = gl.projects.get(project_path, lazy=True)