This is an automated email from the ASF dual-hosted git repository.
sbp pushed a commit to branch sbp
in repository https://gitbox.apache.org/repos/asf/tooling-trusted-releases.git
The following commit(s) were added to refs/heads/sbp by this push:
new e4f18ee6 Give each check its own version number for result cache key
construction
e4f18ee6 is described below
commit e4f18ee6211867886c2fb873237337c45efdfbc3
Author: Sean B. Palmer <[email protected]>
AuthorDate: Wed Mar 11 19:14:56 2026 +0000
Give each check its own version number for result cache key construction
---
atr/tasks/__init__.py | 16 ++++++++--------
atr/tasks/checks/license.py | 3 ++-
atr/tasks/checks/targz.py | 3 ++-
atr/tasks/checks/zipformat.py | 3 ++-
4 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/atr/tasks/__init__.py b/atr/tasks/__init__.py
index 15c4e1e2..a86cc8a0 100644
--- a/atr/tasks/__init__.py
+++ b/atr/tasks/__init__.py
@@ -396,7 +396,7 @@ async def tar_gz_checks(
)
license_h_ck = await checks.resolve_cache_key(
resolve(sql.TaskType.LICENSE_HEADERS),
- license.CHECK_VERSION,
+ license.CHECK_VERSION_HEADERS,
license.INPUT_POLICY_KEYS,
release,
revision,
@@ -405,7 +405,7 @@ async def tar_gz_checks(
)
license_f_ck = await checks.resolve_cache_key(
resolve(sql.TaskType.LICENSE_FILES),
- license.CHECK_VERSION,
+ license.CHECK_VERSION_FILES,
license.INPUT_POLICY_KEYS,
release,
revision,
@@ -423,7 +423,7 @@ async def tar_gz_checks(
)
targz_i_ck = await checks.resolve_cache_key(
resolve(sql.TaskType.TARGZ_INTEGRITY),
- targz.CHECK_VERSION,
+ targz.CHECK_VERSION_INTEGRITY,
targz.INPUT_POLICY_KEYS,
release,
revision,
@@ -432,7 +432,7 @@ async def tar_gz_checks(
)
targz_s_ck = await checks.resolve_cache_key(
resolve(sql.TaskType.TARGZ_STRUCTURE),
- targz.CHECK_VERSION,
+ targz.CHECK_VERSION_STRUCTURE,
targz.INPUT_POLICY_KEYS,
release,
revision,
@@ -505,7 +505,7 @@ async def zip_checks(
)
license_h_ck = await checks.resolve_cache_key(
resolve(sql.TaskType.LICENSE_HEADERS),
- license.CHECK_VERSION,
+ license.CHECK_VERSION_HEADERS,
license.INPUT_POLICY_KEYS,
release,
revision,
@@ -514,7 +514,7 @@ async def zip_checks(
)
license_f_ck = await checks.resolve_cache_key(
resolve(sql.TaskType.LICENSE_FILES),
- license.CHECK_VERSION,
+ license.CHECK_VERSION_FILES,
license.INPUT_POLICY_KEYS,
release,
revision,
@@ -532,7 +532,7 @@ async def zip_checks(
)
zip_i_ck = await checks.resolve_cache_key(
resolve(sql.TaskType.ZIPFORMAT_INTEGRITY),
- zipformat.CHECK_VERSION,
+ zipformat.CHECK_VERSION_INTEGRITY,
zipformat.INPUT_POLICY_KEYS,
release,
revision,
@@ -541,7 +541,7 @@ async def zip_checks(
)
zip_s_ck = await checks.resolve_cache_key(
resolve(sql.TaskType.ZIPFORMAT_STRUCTURE),
- zipformat.CHECK_VERSION,
+ zipformat.CHECK_VERSION_STRUCTURE,
zipformat.INPUT_POLICY_KEYS,
release,
revision,
diff --git a/atr/tasks/checks/license.py b/atr/tasks/checks/license.py
index 6d60e43f..b5858deb 100644
--- a/atr/tasks/checks/license.py
+++ b/atr/tasks/checks/license.py
@@ -81,7 +81,8 @@ INCLUDED_PATTERNS: Final[list[str]] = [
# Release policy fields which this check relies on - used for result caching
INPUT_POLICY_KEYS: Final[list[str]] = ["license_check_mode",
"source_excludes_lightweight"]
INPUT_EXTRA_ARGS: Final[list[str]] = ["is_podling"]
-CHECK_VERSION: Final[str] = "3"
+CHECK_VERSION_FILES: Final[str] = "3"
+CHECK_VERSION_HEADERS: Final[str] = "3"
# Types
diff --git a/atr/tasks/checks/targz.py b/atr/tasks/checks/targz.py
index 302e5b3b..0565d957 100644
--- a/atr/tasks/checks/targz.py
+++ b/atr/tasks/checks/targz.py
@@ -32,7 +32,8 @@ import atr.util as util
# Release policy fields which this check relies on - used for result caching
INPUT_POLICY_KEYS: Final[list[str]] = []
INPUT_EXTRA_ARGS: Final[list[str]] = []
-CHECK_VERSION: Final[str] = "3"
+CHECK_VERSION_INTEGRITY: Final[str] = "3"
+CHECK_VERSION_STRUCTURE: Final[str] = "3"
class RootDirectoryError(Exception):
diff --git a/atr/tasks/checks/zipformat.py b/atr/tasks/checks/zipformat.py
index df474bf9..9c1294a7 100644
--- a/atr/tasks/checks/zipformat.py
+++ b/atr/tasks/checks/zipformat.py
@@ -31,7 +31,8 @@ import atr.util as util
# Release policy fields which this check relies on - used for result caching
INPUT_POLICY_KEYS: Final[list[str]] = []
INPUT_EXTRA_ARGS: Final[list[str]] = []
-CHECK_VERSION: Final[str] = "2"
+CHECK_VERSION_INTEGRITY: Final[str] = "2"
+CHECK_VERSION_STRUCTURE: Final[str] = "2"
async def integrity(args: checks.FunctionArguments) -> results.Results | None:
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
