Skip to content

Commit 5f43d84

Browse files
[cherrypick][rc] fix: more fix on win arm64 (#2289)
[auto][cherrypick] 3413317 fix: more fix on win arm64 (#2247)
1 parent 3fa5465 commit 5f43d84

File tree

3 files changed

+39
-21
lines changed

3 files changed

+39
-21
lines changed

.github/build_plan.py

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,13 @@ def map_arm64_runners(included):
3737

3838
return included
3939

40-
def filter_windows_arm11_for_public_only(included):
41-
"""
42-
Filter out windows-arm11 (windows + aarch64) config if this is a private repo.
43-
windows-arm11 should only run on public repo.
44-
"""
45-
if is_private_repo:
46-
included["config"] = [
47-
config
48-
for config in included["config"]
49-
if not (config.get("os") == "windows" and config.get("arch") == "aarch64")
50-
]
40+
def map_win_arm64_runner(included):
41+
if not is_private_repo:
42+
return included
43+
44+
for config in included["config"]:
45+
if config["runner"] == "windows-11-arm":
46+
config["runner"] = "statsig-windows-arm64"
5147
return included
5248

5349

@@ -78,7 +74,7 @@ def export_outputs(included):
7874

7975
included, excluded = partition_targets(should_build_all)
8076
included = map_arm64_runners(included)
81-
included = filter_windows_arm11_for_public_only(included)
77+
included = map_win_arm64_runner(included)
8278
export_outputs(included)
8379

8480
print("\n== Included ==")

cli/src/commands/publishers/node-publisher.ts

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -174,16 +174,18 @@ function alignNodePackage(options: PublisherOptions, distDir: string) {
174174
});
175175

176176
if (!allFilesMoved) {
177+
allPlatformsAligned = false;
178+
Log.stepEnd(`Failed to move all files for ${platform}`, 'failure');
177179
// Windows ARM64 (aarch64-pc-windows-msvc) alignment failure should not fail the entire process
178-
if (platform === 'aarch64-pc-windows-msvc') {
179-
Log.stepProgress(
180-
`Windows ARM64 files not found (may not be built in private repo), skipping`,
181-
);
182-
Log.stepEnd(`Skipped ${platform} (files not found)`);
183-
} else {
184-
allPlatformsAligned = false;
185-
Log.stepEnd(`Failed to move all files for ${platform}`, 'failure');
186-
}
180+
// if (platform === 'aarch64-pc-windows-msvc') {
181+
// Log.stepProgress(
182+
// `Windows ARM64 files not found (may not be built in private repo), skipping`,
183+
// );
184+
// Log.stepEnd(`Skipped ${platform} (files not found)`);
185+
// } else {
186+
// allPlatformsAligned = false;
187+
// Log.stepEnd(`Failed to move all files for ${platform}`, 'failure');
188+
//}
187189
return;
188190
}
189191

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"name": "@statsig/statsig-node-core-win32-arm64-msvc",
3+
"version": "0.12.1-beta.2511110238",
4+
"repository": "https://github.com/statsig-io/statsig-server-core.git",
5+
"os": [
6+
"win32"
7+
],
8+
"cpu": [
9+
"arm64"
10+
],
11+
"main": "statsig-node-core.win32-arm64-msvc.node",
12+
"files": [
13+
"statsig-node-core.win32-arm64-msvc.node"
14+
],
15+
"license": "MIT",
16+
"engines": {
17+
"node": ">= 10"
18+
}
19+
}
20+

0 commit comments

Comments
 (0)