From 675e391ea5b27bc8bc659450299864094a1b98e8 Mon Sep 17 00:00:00 2001 From: s3lph Date: Tue, 19 Jul 2022 03:02:36 +0200 Subject: [PATCH] release.py: Use new Gitlab releases API --- package/release.py | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/package/release.py b/package/release.py index 4f09ba3..431c569 100755 --- a/package/release.py +++ b/package/release.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 from typing import Any, Dict, List, Optional, Tuple @@ -28,7 +29,7 @@ def parse_changelog(tag: str) -> Optional[str]: return release_changelog -def fetch_job_ids(project_id: str, pipeline_id: str, api_token: str) -> Dict[str, str]: +def fetch_job_ids(project_id: int, pipeline_id: int, api_token: str) -> Dict[str, str]: url: str = f'https://gitlab.com/api/v4/projects/{project_id}/pipelines/{pipeline_id}/jobs' headers: Dict[str, str] = { 'Private-Token': api_token, @@ -51,10 +52,9 @@ def fetch_job_ids(project_id: str, pipeline_id: str, api_token: str) -> Dict[str return jobidmap -def fetch_single_shafile(url: str, api_token: str) -> str: +def fetch_single_shafile(url: str) -> str: headers: Dict[str, str] = { - 'User-Agent': 'curl/7.70.0', - 'Private-Token': api_token + 'User-Agent': 'curl/7.70.0' } req = urllib.request.Request(url, headers=headers) try: @@ -68,20 +68,18 @@ def fetch_single_shafile(url: str, api_token: str) -> str: return filename -def fetch_wheel_url(base_url: str, project_id: str, job_ids: Dict[str, str], api_token: str) -> Optional[Tuple[str, str]]: +def fetch_wheel_url(base_url: str, job_ids: Dict[str, str]) -> Optional[Tuple[str, str]]: mybase: str = f'{base_url}/jobs/{job_ids["build_wheel"]}/artifacts/raw' - wheel_sha_url: str = f'https://gitlab.com/api/v4/projects/{project_id}/jobs/{job_ids["build_wheel"]}'\ - '/artifacts/dist/SHA256SUMS' - wheel_filename: str = fetch_single_shafile(wheel_sha_url, api_token) + wheel_sha_url: str = f'{mybase}/dist/SHA256SUMS' + wheel_filename: str = fetch_single_shafile(wheel_sha_url) wheel_url: str = f'{mybase}/dist/{wheel_filename}' return wheel_url, wheel_sha_url -def fetch_debian_url(base_url: str, project_id: str, job_ids: Dict[str, str], api_token: str) -> Optional[Tuple[str, str]]: +def fetch_debian_url(base_url: str, job_ids: Dict[str, str]) -> Optional[Tuple[str, str]]: mybase: str = f'{base_url}/jobs/{job_ids["build_debian"]}/artifacts/raw' - debian_sha_url: str = f'https://gitlab.com/api/v4/projects/{project_id}/jobs/{job_ids["build_debian"]}'\ - '/artifacts/package/debian/SHA256SUMS' - debian_filename: str = fetch_single_shafile(debian_sha_url, api_token) + debian_sha_url: str = f'{mybase}/package/debian/SHA256SUMS' + debian_filename: str = fetch_single_shafile(debian_sha_url) debian_url: str = f'{mybase}/package/debian/{debian_filename}' return debian_url, debian_sha_url @@ -117,17 +115,16 @@ def main(): base_url: str = f'https://gitlab.com/{project_name}/-' - wheel_url, wheel_sha_url = fetch_wheel_url(base_url, project_id, job_ids, api_token) - debian_url, debian_sha_url = fetch_debian_url(base_url, project_id, job_ids, api_token) + wheel_url, wheel_sha_url = fetch_wheel_url(base_url, job_ids) + debian_url, debian_sha_url = fetch_debian_url(base_url, job_ids) augmented_changelog = f'''{changelog.strip()} ### Download - [Python Wheel]({wheel_url}) ([sha256]({wheel_sha_url})) -- [Debian Package]({debian_url}) ([sha256]({debian_sha_url}))''' - # Docker currently not working - # - Docker image: registry.gitlab.com/{project_name}:{release_tag} +- [Debian Package]({debian_url}) ([sha256]({debian_sha_url})) +- Docker image: registry.gitlab.com/{project_name}:{release_tag}''' post_body: str = json.dumps({ 'tag_name': release_tag,