Skip to content

Commit 22e4258

Browse files
committed
Merge branch 'main' into feature/asset-store-compliance-fixed
2 parents ad8807d + f6796e6 commit 22e4258

File tree

271 files changed

+7592
-31438
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

271 files changed

+7592
-31438
lines changed

.github/scripts/mark_skipped.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
r"validation error .* ctx",
3030
]
3131

32+
3233
def should_skip(msg: str) -> bool:
3334
if not msg:
3435
return False
@@ -38,6 +39,7 @@ def should_skip(msg: str) -> bool:
3839
return True
3940
return False
4041

42+
4143
def summarize_counts(ts: ET.Element):
4244
tests = 0
4345
failures = 0
@@ -53,6 +55,7 @@ def summarize_counts(ts: ET.Element):
5355
skipped += 1
5456
return tests, failures, errors, skipped
5557

58+
5659
def main(path: str) -> int:
5760
if not os.path.exists(path):
5861
print(f"[mark_skipped] No JUnit at {path}; nothing to do.")
@@ -79,7 +82,8 @@ def main(path: str) -> int:
7982
for n in nodes:
8083
msg = (n.get("message") or "") + "\n" + (n.text or "")
8184
if should_skip(msg):
82-
first_match_text = (n.text or "").strip() or first_match_text
85+
first_match_text = (
86+
n.text or "").strip() or first_match_text
8387
to_skip = True
8488
if to_skip:
8589
for n in nodes:
@@ -98,12 +102,14 @@ def main(path: str) -> int:
98102

99103
if changed:
100104
tree.write(path, encoding="utf-8", xml_declaration=True)
101-
print(f"[mark_skipped] Updated {path}: converted environmental failures to skipped.")
105+
print(
106+
f"[mark_skipped] Updated {path}: converted environmental failures to skipped.")
102107
else:
103108
print(f"[mark_skipped] No environmental failures detected in {path}.")
104109

105110
return 0
106111

112+
107113
if __name__ == "__main__":
108114
target = (
109115
sys.argv[1]

.github/workflows/bump-version.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
- major
1313
default: patch
1414
required: true
15-
15+
1616
jobs:
1717
bump:
1818
name: "Bump version and tag"
@@ -70,6 +70,9 @@ jobs:
7070
echo "Updating UnityMcpBridge/UnityMcpServer~/src/pyproject.toml to $NEW_VERSION"
7171
sed -i '0,/^version = ".*"/s//version = "'"$NEW_VERSION"'"/' "UnityMcpBridge/UnityMcpServer~/src/pyproject.toml"
7272
73+
echo "Updating UnityMcpBridge/UnityMcpServer~/src/server_version.txt to $NEW_VERSION"
74+
echo "$NEW_VERSION" > "UnityMcpBridge/UnityMcpServer~/src/server_version.txt"
75+
7376
- name: Commit and push changes
7477
env:
7578
NEW_VERSION: ${{ steps.compute.outputs.new_version }}
@@ -78,7 +81,7 @@ jobs:
7881
set -euo pipefail
7982
git config user.name "GitHub Actions"
8083
git config user.email "[email protected]"
81-
git add UnityMcpBridge/package.json "UnityMcpBridge/UnityMcpServer~/src/pyproject.toml"
84+
git add UnityMcpBridge/package.json "UnityMcpBridge/UnityMcpServer~/src/pyproject.toml" "UnityMcpBridge/UnityMcpServer~/src/server_version.txt"
8285
if git diff --cached --quiet; then
8386
echo "No version changes to commit."
8487
else

0 commit comments

Comments
 (0)