@@ -276,6 +276,7 @@ def test_macos_release_sets_up_ci_keychain_before_build_and_cleans_up(self):
276276 self .assertIn ("MACOS_CERTIFICATE_P12" , secrets )
277277 self .assertIn ("MACOS_CERTIFICATE_PWD" , secrets )
278278 self .assertIn ("PROD_MACOS_BROWSEROS_PASSKEY_PROFILE_B64" , secrets )
279+ self .assertIn ("PROD_MACOS_BROWSERCLAW_PASSKEY_PROFILE_B64" , secrets )
279280 self .assertLess (setup_index , build_index )
280281 self .assertLess (build_index , cleanup_index )
281282 self .assertLess (cleanup_index , upload_index )
@@ -287,6 +288,7 @@ def test_macos_release_sets_up_ci_keychain_before_build_and_cleans_up(self):
287288 "MACOS_CERTIFICATE_PWD" ,
288289 "MACOS_KEYCHAIN_PASSWORD" ,
289290 "PROD_MACOS_BROWSEROS_PASSKEY_PROFILE_B64" ,
291+ "PROD_MACOS_BROWSERCLAW_PASSKEY_PROFILE_B64" ,
290292 ):
291293 self .assertEqual (setup ["env" ][name ], f"${{{{ secrets.{ name } }}}}" )
292294 self .assertEqual (
@@ -299,7 +301,11 @@ def test_macos_release_sets_up_ci_keychain_before_build_and_cleans_up(self):
299301 )
300302 self .assertEqual (
301303 build ["env" ]["PROD_MACOS_BROWSEROS_PASSKEY_PROFILE_PATH" ],
302- "${{ steps.macos_signing.outputs.passkey_profile_path }}" ,
304+ "${{ steps.macos_signing.outputs.browseros_passkey_profile_path }}" ,
305+ )
306+ self .assertEqual (
307+ build ["env" ]["PROD_MACOS_BROWSERCLAW_PASSKEY_PROFILE_PATH" ],
308+ "${{ steps.macos_signing.outputs.browserclaw_passkey_profile_path }}" ,
303309 )
304310 self .assertEqual (cleanup ["if" ], "always()" )
305311 self .assertEqual (
@@ -1857,16 +1863,28 @@ def test_internal_builder_uses_reservation_and_frozen_artifact_source(self):
18571863 "PROD_MACOS_BROWSEROS_PASSKEY_PROFILE_B64" ,
18581864 triggers ["workflow_call" ]["secrets" ],
18591865 )
1866+ self .assertIn (
1867+ "PROD_MACOS_BROWSERCLAW_PASSKEY_PROFILE_B64" ,
1868+ triggers ["workflow_call" ]["secrets" ],
1869+ )
18601870 setup = self .named_step (
18611871 workflow , "build" , "Import macOS signing certificate"
18621872 )
18631873 self .assertEqual (
18641874 setup ["env" ]["PROD_MACOS_BROWSEROS_PASSKEY_PROFILE_B64" ],
18651875 "${{ secrets.PROD_MACOS_BROWSEROS_PASSKEY_PROFILE_B64 }}" ,
18661876 )
1877+ self .assertEqual (
1878+ setup ["env" ]["PROD_MACOS_BROWSERCLAW_PASSKEY_PROFILE_B64" ],
1879+ "${{ secrets.PROD_MACOS_BROWSERCLAW_PASSKEY_PROFILE_B64 }}" ,
1880+ )
18671881 self .assertEqual (
18681882 build ["env" ]["PROD_MACOS_BROWSEROS_PASSKEY_PROFILE_PATH" ],
1869- "${{ steps.macos_signing.outputs.passkey_profile_path }}" ,
1883+ "${{ steps.macos_signing.outputs.browseros_passkey_profile_path }}" ,
1884+ )
1885+ self .assertEqual (
1886+ build ["env" ]["PROD_MACOS_BROWSERCLAW_PASSKEY_PROFILE_PATH" ],
1887+ "${{ steps.macos_signing.outputs.browserclaw_passkey_profile_path }}" ,
18701888 )
18711889 self .assertNotIn ("BROWSERCLAW_ONBOARD_RESOURCE_VERSION" , build ["env" ])
18721890 for secret in (
@@ -2453,7 +2471,8 @@ def test_setup_imports_p12_and_cleanup_restores_keychain_state(self):
24532471 smoke_path = self .runner_temp / "browseros-ci-codesign-smoke-123-4"
24542472
24552473 self .assertEqual (outputs ["codesign_identity" ], self .identity_sha1 )
2456- self .assertEqual (outputs ["passkey_profile_path" ], "" )
2474+ self .assertEqual (outputs ["browseros_passkey_profile_path" ], "" )
2475+ self .assertEqual (outputs ["browserclaw_passkey_profile_path" ], "" )
24572476 self .assertTrue (keychain_path .exists ())
24582477 self .assertTrue (state_path .exists ())
24592478 self .assertFalse (cert_path .exists ())
@@ -2489,27 +2508,37 @@ def test_setup_imports_p12_and_cleanup_restores_keychain_state(self):
24892508 self .assertFalse (keychain_path .exists ())
24902509 self .assertFalse (state_path .exists ())
24912510
2492- def test_setup_decodes_passkey_profile_and_cleanup_removes_it (self ):
2511+ def test_setup_decodes_both_passkey_profiles_and_cleanup_removes_them (self ):
24932512 result = self ._run_helper (
24942513 "setup" ,
24952514 PROD_MACOS_BROWSEROS_PASSKEY_PROFILE_B64 = "cHJvZmlsZS1ieXRlcw==" ,
2515+ PROD_MACOS_BROWSERCLAW_PASSKEY_PROFILE_B64 = "Y2xhdy1wcm9maWxlLWJ5dGVz" ,
24962516 )
24972517 self .assertEqual (result .returncode , 0 , result .stderr + result .stdout )
24982518 outputs = self ._outputs ()
2499- profile_path = Path (outputs ["passkey_profile_path" ])
2500- self .assertEqual (profile_path .read_bytes (), b"profile-bytes" )
2501- self .assertEqual (profile_path .stat ().st_mode & 0o777 , 0o600 )
2519+ browseros_profile_path = Path (outputs ["browseros_passkey_profile_path" ])
2520+ browserclaw_profile_path = Path (outputs ["browserclaw_passkey_profile_path" ])
2521+ self .assertEqual (browseros_profile_path .read_bytes (), b"profile-bytes" )
2522+ self .assertEqual (browserclaw_profile_path .read_bytes (), b"claw-profile-bytes" )
2523+ self .assertEqual (browseros_profile_path .stat ().st_mode & 0o777 , 0o600 )
2524+ self .assertEqual (browserclaw_profile_path .stat ().st_mode & 0o777 , 0o600 )
2525+ env_lines = self .github_env .read_text (encoding = "utf-8" ).splitlines ()
25022526 self .assertIn (
2503- f"PROD_MACOS_BROWSEROS_PASSKEY_PROFILE_PATH={ profile_path } " ,
2504- self .github_env .read_text (encoding = "utf-8" ).splitlines (),
2527+ f"PROD_MACOS_BROWSEROS_PASSKEY_PROFILE_PATH={ browseros_profile_path } " ,
2528+ env_lines ,
2529+ )
2530+ self .assertIn (
2531+ f"PROD_MACOS_BROWSERCLAW_PASSKEY_PROFILE_PATH={ browserclaw_profile_path } " ,
2532+ env_lines ,
25052533 )
25062534
25072535 cleanup = self ._run_helper (
25082536 "cleanup" ,
25092537 MACOS_SIGNING_STATE_PATH = outputs ["state_path" ],
25102538 )
25112539 self .assertEqual (cleanup .returncode , 0 , cleanup .stderr + cleanup .stdout )
2512- self .assertFalse (profile_path .exists ())
2540+ self .assertFalse (browseros_profile_path .exists ())
2541+ self .assertFalse (browserclaw_profile_path .exists ())
25132542
25142543 def test_setup_uses_fingerprint_when_common_name_is_duplicated (self ):
25152544 result = self ._run_helper ("setup" , CODESIGN_REJECT_COMMON_NAME = "1" )
0 commit comments