Skip to content

build: bump versions and reduce false positives #2013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alandtse merged 4 commits into from
Mar 25, 2026
Merged

build: bump versions and reduce false positives #2013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a3891a5
build: bump versions and reduce false positives
alandtse Mar 25, 2026
9b93b28
chore: address ai comments
alandtse Mar 25, 2026
9c64fea
chore: more ai comments
alandtse Mar 25, 2026
43b2c07
chore: handle more ai comments
alandtse Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions features/Dynamic Cubemaps/Shaders/Features/DynamicCubemaps.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[Info]
Version = 2-2-3
[Info]
Version = 2-3-0
4 changes: 2 additions & 2 deletions features/Grass Collision/Shaders/Features/GrassCollision.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[Info]
Version = 3-0-2
[Info]
Version = 3-0-3
4 changes: 2 additions & 2 deletions features/Grass Lighting/Shaders/Features/GrassLighting.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[Info]
Version = 2-0-0
[Info]
Version = 2-0-1
4 changes: 2 additions & 2 deletions features/Hair Specular/Shaders/Features/HairSpecular.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[Info]
Version = 1-0-3
[Info]
Version = 1-1-0
4 changes: 2 additions & 2 deletions features/IBL/Shaders/Features/ImageBasedLighting.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[Info]
Version = 1-0-1
[Info]
Version = 1-1-0
4 changes: 2 additions & 2 deletions features/Linear Lighting/Shaders/Features/LinearLighting.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[Info]
Version = 1-0-0
[Info]
Version = 1-1-0
4 changes: 2 additions & 2 deletions features/Screen Space GI/Shaders/Features/ScreenSpaceGI.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[Info]
Version = 4-0-1
[Info]
Version = 4-1-0
4 changes: 2 additions & 2 deletions features/Screen-Space Shadows/Shaders/Features/ScreenSpaceShadows.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[Info]
Version = 2-0-0
[Info]
Version = 2-1-0
4 changes: 2 additions & 2 deletions features/Sky Sync/Shaders/Features/SkySync.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[Info]
Version = 1-0-0
[Info]
Version = 1-0-1
4 changes: 2 additions & 2 deletions features/Skylighting/Shaders/Features/Skylighting.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[Info]
Version = 1-2-3
[Info]
Version = 1-2-4
4 changes: 2 additions & 2 deletions features/Terrain Blending/Shaders/Features/TerrainBlending.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[Info]
Version = 1-0-1
[Info]
Version = 1-0-2
4 changes: 2 additions & 2 deletions features/Terrain Shadows/Shaders/Features/TerrainShadows.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[Info]
Version = 1-0-2
[Info]
Version = 1-1-0
4 changes: 2 additions & 2 deletions features/Unified Water/Shaders/Features/UnifiedWater.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[Info]
Version = 1-0-0
[Info]
Version = 1-0-1
4 changes: 2 additions & 2 deletions features/Upscaling/Shaders/Features/Upscaling.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[Info]
Version = 1-2-0
[Info]
Version = 1-3-0
4 changes: 2 additions & 2 deletions features/VR/Shaders/Features/VR.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[Info]
Version = 1-0-1
[Info]
Version = 1-1-0
4 changes: 2 additions & 2 deletions features/Volumetric Lighting/Shaders/Features/VolumetricLighting.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[Info]
Version = 1-0-0
[Info]
Version = 1-1-0
4 changes: 2 additions & 2 deletions features/Weather Editor/Shaders/Features/WeatherEditor.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[Info]
Version = 1-0-0
[Info]
Version = 1-1-0
4 changes: 2 additions & 2 deletions features/Wetness Effects/Shaders/Features/WetnessEffects.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[Info]
Version = 3-0-0
[Info]
Version = 3-1-0
39 changes: 28 additions & 11 deletions tools/feature_version_audit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
RE_COMMIT_REFACTOR = re.compile(r"^refactor(\(|:|\s)", re.IGNORECASE)
RE_COMMIT_PERF = re.compile(r"^perf(\(|:|\s)", re.IGNORECASE)
RE_COMMIT_BREAKING = re.compile(r"!\s*:|BREAKING CHANGE:", re.IGNORECASE)
RE_COMMIT_NONFUNCTIONAL = re.compile(r"^(chore|docs|style|ci|test|build)(\(|:|\s)", re.IGNORECASE)
RE_COMMIT_NONFUNCTIONAL = re.compile(r"^(chore|docs|style|ci|test|build|refactor|perf)(\(|:|\s)", re.IGNORECASE)
Comment thread
alandtse marked this conversation as resolved.

# =====================
# End Configuration
Expand Down Expand Up @@ -110,26 +110,39 @@ def get_changed_files(feature_path, base_ref, file_types=None):
def get_commits_for_file(file_path, base_ref):
try:
output = subprocess.check_output(
["git", "log", f"{base_ref}..HEAD", "--pretty=%s", "--", file_path],
["git", "log", f"{base_ref}..HEAD", "--pretty=%B%x1e", "--", file_path],
stderr=subprocess.DEVNULL,
).decode("utf-8")
return [line.strip() for line in output.splitlines() if line.strip()]
return [msg.strip() for msg in output.split("\x1e") if msg.strip()]
except Exception:
return []

def get_bump_commit(file_path, base_ref):
try:
output = subprocess.check_output(
["git", "log", f"{base_ref}..HEAD", "--pretty=%H %s", "--", file_path],
["git", "log", f"{base_ref}..HEAD", "--pretty=%H%x1f%B%x1e", "--", file_path],
stderr=subprocess.DEVNULL,
).decode("utf-8")
for line in output.splitlines():
parts = line.split(" ", 1)
for entry in output.split("\x1e"):
if not entry.strip():
continue
parts = entry.strip().split("\x1f", 1)
if len(parts) < 2:
continue
commit_hash, msg = parts
if RE_COMMIT_FEAT.match(msg) or RE_COMMIT_FIX.match(msg) or RE_COMMIT_REFACTOR.match(msg) or RE_COMMIT_PERF.match(msg) or RE_COMMIT_BREAKING.search(msg):
return commit_hash
if RE_COMMIT_FEAT.match(msg) or RE_COMMIT_FIX.match(msg) or RE_COMMIT_BREAKING.search(msg):
return commit_hash.strip()
except Exception:
pass
return None

def get_latest_commit(file_paths, base_ref):
try:
output = subprocess.check_output(
["git", "log", f"{base_ref}..HEAD", "-1", "--pretty=%H", "--", *sorted(file_paths)],
stderr=subprocess.DEVNULL,
).decode("utf-8").strip()
return output or None
except Exception:
pass
return None
Expand Down Expand Up @@ -272,7 +285,7 @@ def propose_new_version(prior_version, commits):
return None

is_minor = any(RE_COMMIT_FEAT.match(c) or RE_COMMIT_BREAKING.search(c) for c in commits)
is_patch = any(RE_COMMIT_FIX.match(c) or RE_COMMIT_REFACTOR.match(c) or RE_COMMIT_PERF.match(c) for c in commits)
is_patch = any(RE_COMMIT_FIX.match(c) for c in commits)
is_nonfunctional_only = all(RE_COMMIT_NONFUNCTIONAL.match(c) for c in commits)

if is_minor:
Expand Down Expand Up @@ -376,12 +389,16 @@ def get_feature_key(feature_dir, feature_meta_map):
bump_commit = None
bump_author = None
for status, f in changes:
commits = get_commits_for_file(f, base_ref)
all_commits.extend(commits)
all_commits.extend(get_commits_for_file(f, base_ref))
if not bump_commit:
bump_commit = get_bump_commit(f, base_ref)
if bump_commit:
bump_author = get_commit_author(bump_commit)
if not bump_commit and changes:
any_commit = get_latest_commit([f for _, f in changes], base_ref)
if any_commit:
bump_commit = any_commit
bump_author = get_commit_author(any_commit)

proposed_ver = propose_new_version(prior_ver, all_commits) if ini_path else None
needs_bump = (proposed_ver is not None and new_ver is not None and proposed_ver > new_ver)
Expand Down
Loading