From f795412551ddaddbc718929e578beb1d0a4233db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= Date: Tue, 2 Jul 2024 14:01:05 +0200 Subject: [PATCH] [Actions] Use Europe/Warsaw timezone for build dates --- .github/utils/bump_nightly.py | 11 ++--------- .github/utils/save_version.py | 6 +++++- .github/utils/webhook_discord.py | 6 +++++- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/utils/bump_nightly.py b/.github/utils/bump_nightly.py index 3fb74fa4..197e0a94 100644 --- a/.github/utils/bump_nightly.py +++ b/.github/utils/bump_nightly.py @@ -1,7 +1,7 @@ -import os import re import sys from datetime import datetime, timedelta +from zoneinfo import ZoneInfo from _utils import ( get_commit_log, @@ -15,19 +15,12 @@ if __name__ == "__main__": print("usage: bump_nightly.py ") exit(-1) - repo = os.getenv("GITHUB_REPOSITORY") - sha = os.getenv("GITHUB_SHA") - - if not repo or not sha: - print("Missing GitHub environment variables.") - exit(-1) - project_dir = get_project_dir() (version_code, version_name) = read_gradle_version(project_dir) version_name = version_name.split("+")[0] - date = datetime.now() + date = datetime.now(tz=ZoneInfo("Europe/Warsaw")) if date.hour > 6: version_name += "+daily." + date.strftime("%Y%m%d-%H%M") else: diff --git a/.github/utils/save_version.py b/.github/utils/save_version.py index a0eacb49..88ea6f61 100644 --- a/.github/utils/save_version.py +++ b/.github/utils/save_version.py @@ -3,6 +3,7 @@ import os import sys from datetime import datetime from time import time +from zoneinfo import ZoneInfo import mysql.connector as mysql from dotenv import load_dotenv @@ -59,7 +60,10 @@ def save_version( build_date = int(os.stat(file).st_mtime) bundle_name_play = output_aab_play - build_date = datetime.fromtimestamp(build_date).strftime("%Y-%m-%d %H:%M:%S") + build_date = datetime.fromtimestamp( + build_date, + tz=ZoneInfo("Europe/Warsaw"), + ).strftime("%Y-%m-%d %H:%M:%S") if build_type in ["nightly", "daily"]: download_url = apk_server_nightly + apk_name if apk_name else None diff --git a/.github/utils/webhook_discord.py b/.github/utils/webhook_discord.py index cb1e6a0b..80dfbee4 100644 --- a/.github/utils/webhook_discord.py +++ b/.github/utils/webhook_discord.py @@ -1,6 +1,7 @@ import os import sys from datetime import datetime +from zoneinfo import ZoneInfo import requests from dotenv import load_dotenv @@ -27,7 +28,10 @@ def post_webhook( if testing: build_date = int(os.stat(apk_file).st_mtime) if build_date: - build_date = datetime.fromtimestamp(build_date).strftime("%Y-%m-%d %H:%M") + build_date = datetime.fromtimestamp( + build_date, + tz=ZoneInfo("Europe/Warsaw"), + ).strftime("%Y-%m-%d %H:%M") # untagged release, get commit log if build_type in ["nightly", "daily"]: