Compare commits

...
Author SHA1 Message Date
james.maesandCodex 23aacea8a7 fix: use shared Maven credentials for Android publication
Use the existing organization context and Gradle environment properties. Fail before publishing if either credential is absent and avoid writing secrets to gradle.properties.

Co-Authored-By: Codex <noreply@openai.com>
2026-10-20 21:05:19 -05:00
3 changed files with 43 additions and 12 deletions

No files matched your search

+1 -1
View File
@@ -22,7 +22,7 @@ VOYAGE_TEMPLATE = json.loads(zlib.decompress(base64.b64decode("eNrtW+tz2zYS/56/A
NEXT_TEMPLATE = json.loads(zlib.decompress(base64.b64decode("eNrNVE1v2zAMvedXCFqAtlscb70tQLGtXTEUGFYgHXqJM0OxmUSJLCmS7DYr8t9HubaXOOnHYYfdLPLp6fGR9EOHEFqAsVxJOiCn/Q89H1FmYvH4gN94Wq1WAUYwQJdczqxRahlWwc9xfD08j28vhzdX1z/imOKVTcmxUNscOp8Ibudxyux8ophJ4wUzTRoBcA9J7pSP1Q+GC1Yw2qsR1oH2jKMqgKFkDslS5a4BkYZwW3nIpXVMiLgkHOxgEFVnpUoBs87k0NtF+Ez81yZ6ekq3AJvme/OEDpPL/Wcly/xz9BYMn66JmwPhWZY7NhFADAhgFkj9aEtQorKMydRfr5C1vLOIdh8uroYX3y/jn1++vSk2EY3k1CjpQKYNqnvsayKBJhEyrHJu4PioH2qWLNkM+gur5NFJv0JH9CSSGStAbt3PCkmCcxKsyByEHkDBRM4cUn6Fe23AljBt1AISVxNhcqpMAjcuxa4hqQPrUEG3rS+i5MzHW8X5UuorO3qewf/DTp3nXKRlo3BgHE8IVqqMe6Y5iTLgPSUgfVsjqaXOSDVwJAiw7t8gA6GS5ZQ3ebfWUI52dRZcujqF1VefE69m8CjhFWU2y4CN88sXp6CFWtf3xp365uP63imznAp1d2CHK5O3t7da9tHza1iuEdM6LqXv+4wWOGzcXgJTE8MkWnIo5zd4JtFob3jYfxvSFmDTa7M5NnuCSUmx3ilkKxcWB8hr5w653z69PH4v/SabCcM1uHcHhJZel6sRGJhx68w6SAykIB1nwu6qH/f+V/9p+KsYvQ8+jt9FUb/1cRwML5rDyafu/nuvacD+2Hc2nT/snNGl")))
ALL_TEMPLATE = json.loads(zlib.decompress(base64.b64decode("eNq1T7EOgjAU3PmKpjNIdHQyJg4ukmDiYkwDUkxt4UkLEkP4dwsSUojootu7u/fu7lUWQvhOpWKQ4iVazOZ2w4AMlYaVnjXKsszRjCYwZ+lFSQDuduSKEM9fk8PG32+9HSFYn9StRwmSxwJKw0gHsfjhBGnkqAQ47RWtXaGNPHYY9YpZwQ2EIC8X47bbSYOkccRhwUTUhuRU5dhYqvu5rfglZ1xxFHMGSbE91G4SYiYmZUmzgkk6/LPTplsjdPrXD3EhxIcf3sk//sEy1QbVVm09Ad15mhY=")))
STARTER_TEMPLATE = json.loads(zlib.decompress(base64.b64decode("eNp1UMGKwkAMvc9XlDmKtejR0yJ42MsKCl5EQnUzZbbTiZ0ZqiL9d1OpWqt7y3t5eS/JRUSRrNB5TVZOo8loPGwYcjvP8MI1o7IsY2aYkLm2mXdEedKSXwCL5QzW8+Xqe/EDIHmkvnkcyeXK0LFjFNAHIGvOD4rJP7plbVocPTrd7KSoLHwab2V7Kg7aIOxQkUPgi7RqZCo1Hod9rQ14Ci+ZnbQirdDGDjPtgzvHe4e/aINmI/ki3/ZslTaBH/m2W3N3mn3iuaMzy/s2n01Gg0T2BLX4Dz3re7UVd1SLWlwByepyJQ==")))
ANDROID_TEMPLATE = json.loads(zlib.decompress(base64.b64decode("eNrtV21v2jAQ/s6vsKJ92KomdFSbptKhIoGqfugL0K6aRoWMY4LbxE5tp4BQ9tt3TgJJeGtXbVI17Vty57t77rmXOPMKQtYTlYoJbh2hmvNx30iEHCp4ncMzvGHuSsFcEFiESeJTwqqZ7KTmfHIOrP30oEdCm/isdDCTnRw6Nadmwbk4iXAvihEizrStqdJLEQjplJJIC1mQgZTjgJoAGYAFEDvAZMw4zaAkRzX2zEmXjnDkaytTxIsTltI0NCB+5CZkTMmDiHTRzSKSBHxCUtuT2PWpTSBgMVyOsWgT8SQvVUoiRQdim4gggLMGplNNHU+Q0bToMPKsgkW8fI43YFP46WXAANA6lAWnPfCSREeQK1CmCl5SenK4wYPLJLJD9LOaZJJZVO9NLat9PmLcRQ6y9SykaIRA79Ep6lvOXnUYMd8tWzl708DvW8g2RUckRPN4s2PU79f7fBXXZEx50hT+BM/Us7SVGEmKOjChBous1wgKsR4b/2VIr4mDpWYjTF4eJM17S6js6a5SCLzoibV5CrGEOmsY9vJEqRkMQmCzAHt0BZVlqmcwKS0Z90q0L+fqqOxC1RcADg/qnhCeD1mHTNWnXz5ba9DzaXwj475xjJWGutk0iHwMCG0Q26+abCI4p0RTNxnvZur92tRppaFXamIdH6O8fE5RixqN3+vDt7MBgPgwAgOc8/B/IfyFhRBAUbnt0tAXs3/lA7uzi28l0xQRSV3KNcO+Qlqg1KsTShFS4Jzuam1KxgI6Ffqv0Vg37PNM7zE9joadx8dzw3CXegz25OxGUWmQfH0373Q6g+ZFq3t51hqcN7+1Lwbd9ulZ77r7fXDTa3cvmuft+HVBrrBSEyHd3UGumr3e7WW3tT3IH9wdV9HQZ2qM3reSTvtgSE8w7yA6X41hap0YJJ4I1nApvRanG/Pv0lAoBu0y25pDeRaWN09g7WHki0nh+pmMl1nqyV4qjkh2TS00cH5V3f3NWH5+n2d1y3wuOKePEYPRKMHYAWYTjJLybqUcI+avXQoy1VBiDkO4SWf+Erg/Sz4EmHFrRR1Xtr3trFAlrvwCFLRRYQ==")))
ANDROID_TEMPLATE = json.loads(zlib.decompress(base64.b64decode("eNrtVl1P2zAUfedXWNGeEElZ0aYJGKMaFdo0oE1h07SgynXc1JDYqe3QVlX223edpG3SllKQJqFpb869ts+5H+fG0x2ErAcqFRPcOkR15+2esQjZU/A5hTV8Ye5LwXwwWIRJElLCaoXttO68c/atvXxjQGKbhKyysbCdHjh1p27BvjRDuBNlhIQzbWuq9NwERjqmJNFClmxg5TiiBqAgMCNiR5gMGKcFlWyrxoHZ6dM+TkJtFY50tsNSmsaGxK/FETKg5F4kunzNDEkCPyGpHUjsh9QmAFiGW3Asn0l4FpeqBJGzA7NNRBTBXkPTqeUXj5DxnNFeElilE+l8na7hpvDDdsSA0CqVWU47cEuGjiBWSJkq3ZKnZ0E3uveZRHaMfteySIoTtTtTy5rH+4z7yEG2nsQU9RH4AzpGnuXs1noJC/3qKWd3HIWehWxTdERiNE3XX4w878jjy7xGA8qzpghHeKKeTFslI1lRuwaqO4t6JUEx1gNzf5XSS3Cw1KyPyfYgedyPQBWr250S8KwnVvQUYwl11iD2qqLUBIQQ2SzCAV1iZZnqGU5KS8aDStrnujqsXqGOZgQO9o8CIYIQoo6ZOhp/eG+tUF+o8ZXIfa2MlYa62TRKQgwMbTDbL1I2EZxToqmfybuR335t6rTU0Es1sY6P0aJ8TtmLTk6e14evZwJA4uMEDuBFHv4PhL8wECIoKrd9Godi8q/8YDd2cSvphUwN0IjpAVIDLKmPLkwSEIEl5ZrhcFNnK6qh8RKBYhZDbCz0OB3HQmp05Z53z93G2bdmt+VefW1+vu4GAJL02sNhhuDSgMGwnNwoKg2dj571Ztput7sXje/Ny67bPP/SuXZ/dm86TfeycdE8/NQp80uKY4gpUOAwYeBKPev5+C2s1EhI/zH8VqPT+XHlni3hx8WxFfzFDIvz5Gb7s0QTrOH1eC3O1xJxaSwUg7pOQKXbNO38iQg87vuhGJXeiZkOzPTNBki5l4v3ZKnTFm/KzcN9/p98WrGPCGnWknm+qjQ2kFlHo+K8XerQPgtX/t6FqycxB7Ws85nnPA8n2cTGjFtL7rTyna6Igms61utCGg6Hdp4QWZTaLqurGsm2hd9Jd/4AlzFalw==")))
POLICY_TEMPLATE = json.loads(zlib.decompress(base64.b64decode("eNqdVU1v2zAMvedXCL442Rq3aYEegubQQwYMWLGeBgxVESg2nWqVJU9S1gZB/vtIWXbsdCuw+WKJH4+PlEjtR4wlv8A6aXQyZ5fZ7IwkP8za4XaPa9ILJQvhYVoL78HqowqVhcmfwaLkIUpYpwt6WYkNoDrJZbU5r3f+yej5VTa7TDqrQ1w9nrWgFpzZ2hxWuRKOwiWuEkolnYHzULtB0CR/gvzZbH1ndELEbnWPdxRqUQVyn7XzGIDd777f3n3pQTTQpqqELsiwljWT0Xg6LaQTa4WFkfU0VnEaeESgxeI6u8iukh7c4Zj2/xD9Fs+CxbNgpVTg3iMcKn7FOL+5Yeny66eUa1nVxnq2E5XqNm7nuC6tqQj5Sck1i4p73HLNNVhrrGML9vDIdYy+ys1We5RdkEVpbMBcESesUnAdp1k6yexGmfU4/ZCRPp3MuSaesmRC78a1sD7DklrvXmT0YARGCsLpQDOSuNadvtxoL/UWKD7tvd31tATHTA163EFMmHCs7NnQhxUVmAUZZU6UsFJGFONy0qJGsmnbAOcp0XLe9nBPIC383EoLBRUslUV6xlIvvQJa5HiAG2N3tC7A5VbWHq9OUGE+oH36OESrpHNSbwisDKUpiUAXA7mVTJtQLMrlxBvVEeCEJH3NuWaixjJhzjzZdzkd5uwuBi4lqMLhtYxAB55MhljDK/FxwWZt9eA1h7q5bhl1xZIi0jFAj877NMiNroODxhCJwJFCDLAMPyzkv2Evh4B4ua3UnszaZivYfpDdYdh90Q2r3ASKkRsYnnCul03vlOhczDvadI6hTwZuR1dkwNh0kCl2aQav0o9nKADl4CTWLY6l9pKyMLeDK7Y913+ZQu3wHbW7MJeSF2OfS2Ve/vAO9Md/fCl6c/jta/E2wugw+g3AlOQ8")))
MARKETING_TEMPLATE = json.loads(zlib.decompress(base64.b64decode("eNrtW89v4ygUvuevQD7MSKsSp5lbD6OR9rRa7W1uk8oiGMc0GFzATbNV/vd9+EeaOHaqVpt6knBpbfh4wHufee9z3ZcRQsET04YrGdyh6fj2xrUoPTdw+wLXcJcVkluloSFYqmQ6DeuGH5Pxt/HtbQCoTTlspfQyEWq1MzbXmKaMLl+boPFBleZ/1fdo27M7XShVzKJ5wUUcERlHlhm7Y6QGS5Ixt7AShwGHS9xNC+VMvW4zmE7biJzQJVmwKCMSfpV7lXnWRjnbEVUZoGK3g+DXzMGQLiQSXNpZcINeW8o1NU3PKBdkvdJ8kVrEpbFECERTrTJeZAjjFbcpjllu9m24Ge8a2H6XcKZSVRg2C+7bK6VKWvZs97xcdy1gpmIe7DXft4YnXFhw14G/oWuuiYSQdvU55kix7pi07AsTRmyh2WwWjv8IWytuMKmyCX+uIQeI+1bLZtR393q9uTnOs1jRJdORoUT284tnQAtcYlquKnuiBpcRvWSWywVesbnhlrXhmi24sdo5KVikVI+5Ch8hnJirQ+hjwTUzXUFs8d0Hsw6mYVQza96IZo3qjOdVeYvAefaGqwDS7SfCRaRklHAZA9/L4zAhwrBrdmiZaKj78VgQwe2637EOhRvUifKVP0E+HELwPjj2WPhqxIlCl3G5u4pgcpjhq87IKiUc4qGj8NmCTAFFi15HObHp7vLD5gLXiPGDUbLXTF37lJluGXONcI6aTvTlC2I0VejryyywCgqcWXAHl1AYMVNd5hRKpLvbyWSz2XxF39H7VuHZ/EE2Q7orNBwzb2fFEtZ53Psj6YRBHO2OrUMaxOyJCZV74XRNwmkb9YusjU+6u3OoZU/pAF97DuVyXyv6WnEo9vna7nOdXr8trMqrvDBpv88rKK52XkI/7dVhyoiw6fYJDvv6lXaVTvBtMpn0QOJ5bzI8Fu4jGQb1HojoaPWB+hM4ahP8KL2OlXjg1t+Ym506ASriBbDG64Sr0glN1C9TJ5xyd2ehE07oAK8ThnK51wleJwzFPq8TPtfpXid4nTAYNzt1gmaCEcMw7DvmMbHMKwb/SVZNCv+JzjCuON/vbwbwlhcuZxEfr3K8yjkLqnpJ9BtHyOsnr58ugshVbR/VM/ezuMLhBvcODhzy/8NhuSgd0qmCc63igtrquPby93r+YJYRLv2LvsES1XuKmGFfvJ2KKEXuXrpFNIZckKt+llQ4TGNc4tq+2Q4P/lbJzxWTdv1zpUIqCgP7xvAsqdy0RzH5xLWSGaDdSHcIdhhOlM5ICViCMXjA/2UdqH2StngXvklasNCw0DJJpDXl2LCGh83UxJ3R4zXJxIEFHsEuIwaBKuUb5T+chfEh62tks9Z/qkigP/+63PR6Mvr6Oub/cvR+XeL+e3q0Gf0Hgnpc+w==")))
+6 -9
View File
@@ -86,14 +86,8 @@
"android/restore-gradle-cache",
{
"run": {
"name": "Write credentials to gradle.properties",
"command": "echo \"\" >> gradle.properties\necho \"githubQqqMavenRegistryUsername=${QQQ_ANDROID_MAVEN_REGISTRY_USERNAME}\" >> gradle.properties\necho \"githubQqqMavenRegistryPassword=${QQQ_ANDROID_MAVEN_REGISTRY_PASSWORD}\" >> gradle.properties\n"
}
},
{
"run": {
"name": "Publish (Deploy) to Maven",
"command": "./gradlew publishMavenPublicationToGithubQqqMavenRegistryRepository\n"
"name": "Publish with shared Maven credentials",
"command": "set -euo pipefail\nexport ORG_GRADLE_PROJECT_githubQqqMavenRegistryUsername=\"${QQQ_MAVEN_REGISTRY_USERNAME:?Shared Maven username is required}\"\nexport ORG_GRADLE_PROJECT_githubQqqMavenRegistryPassword=\"${QQQ_MAVEN_REGISTRY_PASSWORD:?Shared Maven password is required}\"\n./gradlew publishMavenPublicationToGithubQqqMavenRegistryRepository\n"
}
}
]
@@ -116,7 +110,10 @@
"branches": {
"only": "main"
}
}
},
"context": [
"qqq-maven-registry-credentials"
]
}
}
]
+36 -2
View File
@@ -2,7 +2,10 @@
import contextlib
import io
import json
import os
from pathlib import Path, PurePosixPath
import subprocess
import tempfile
import unittest
from unittest import mock
@@ -17,17 +20,48 @@ class MobilePolicyTests(unittest.TestCase):
after = json.loads((ROOT / "src/scripts/templates/android.json").read_text())
self.assertEqual(after["orbs"], before["orbs"])
self.assertEqual(set(after["jobs"]), {"unit-test", "android-test", "maven-deploy"})
for name, job in after["jobs"].items():
self.assertEqual(job, before["jobs"][name])
for name in ("unit-test", "android-test"):
self.assertEqual(after["jobs"][name], before["jobs"][name])
self.assertEqual(after["jobs"]["maven-deploy"]["executor"], before["jobs"]["maven-deploy"]["executor"])
self.assertEqual(after["jobs"]["maven-deploy"]["steps"][:2], before["jobs"]["maven-deploy"]["steps"][:2])
entries = after["workflows"]["test-and-build"]["jobs"]
self.assertEqual(entries[0], "unit-test")
self.assertEqual(entries[1], {"android-test": {}})
publish = entries[2]["maven-deploy"]
self.assertEqual(publish["context"], ["qqq-maven-registry-credentials"])
self.assertEqual(publish["requires"], ["unit-test", "android-test"])
self.assertEqual(publish["filters"], {"branches": {"only": "main"}})
# No new dormant Firebase benchmark or nonexistent app module build.
self.assertNotIn("benchmarks-ftl", after["jobs"])
def test_android_publication_uses_shared_credentials_without_persisting_them(self):
data = json.loads((ROOT / "src/scripts/templates/android.json").read_text())
steps = data["jobs"]["maven-deploy"]["steps"]
self.assertEqual(len(steps), 3)
command = steps[2]["run"]["command"]
with tempfile.TemporaryDirectory() as folder:
root = Path(folder)
runner = root / "gradlew"
runner.write_text('''#!/bin/bash
set -eu
test "$1" = publishMavenPublicationToGithubQqqMavenRegistryRepository
test "$ORG_GRADLE_PROJECT_githubQqqMavenRegistryUsername" = fixture-user
test "$ORG_GRADLE_PROJECT_githubQqqMavenRegistryPassword" = fixture-password
touch invoked
''')
runner.chmod(0o755)
base = {**os.environ, "QQQ_MAVEN_REGISTRY_USERNAME": "fixture-user",
"QQQ_MAVEN_REGISTRY_PASSWORD": "fixture-password"}
for missing in ("QQQ_MAVEN_REGISTRY_USERNAME", "QQQ_MAVEN_REGISTRY_PASSWORD", None):
env = dict(base)
if missing:
env.pop(missing)
result = subprocess.run(["bash", "-c", command], cwd=root, env=env, capture_output=True, text=True)
self.assertEqual(result.returncode == 0, missing is None)
self.assertEqual((root / "invoked").exists(), missing is None)
self.assertFalse((root / "gradle.properties").exists())
self.assertNotIn("fixture-password", result.stdout + result.stderr)
def test_policy_stays_small_and_validates_actual_pattern_content(self):
data = json.loads((ROOT / "src/scripts/templates/mcp-policy.json").read_text())
job = data["jobs"]["validate-patterns"]