-
Notifications
You must be signed in to change notification settings - Fork 2.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #44527 from margelo/fix/missing-profiler-binaries-…
…e2e-tests [NoQA] fix: missing profiler binaries in e2e on AWS
- Loading branch information
Showing
4 changed files
with
30 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
26 changes: 26 additions & 0 deletions
26
patches/@perf-profiler+android+0.12.0+002+aws-binaries.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
diff --git a/node_modules/@perf-profiler/android/dist/src/commands/platforms/UnixProfiler.js b/node_modules/@perf-profiler/android/dist/src/commands/platforms/UnixProfiler.js | ||
index 59aeed9..ee1d8a6 100644 | ||
--- a/node_modules/@perf-profiler/android/dist/src/commands/platforms/UnixProfiler.js | ||
+++ b/node_modules/@perf-profiler/android/dist/src/commands/platforms/UnixProfiler.js | ||
@@ -28,7 +28,7 @@ exports.CppProfilerName = `BAMPerfProfiler`; | ||
// into the Flipper plugin directory | ||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment | ||
// @ts-expect-error | ||
-const binaryFolder = global.Flipper | ||
+const binaryFolder = (global.Flipper || process.env.AWS) | ||
? `${__dirname}/bin` | ||
: `${__dirname}/../../..${__dirname.includes("dist") ? "/.." : ""}/cpp-profiler/bin`; | ||
class UnixProfiler { | ||
diff --git a/node_modules/@perf-profiler/android/src/commands/platforms/UnixProfiler.ts b/node_modules/@perf-profiler/android/src/commands/platforms/UnixProfiler.ts | ||
index ccacf09..1eea659 100644 | ||
--- a/node_modules/@perf-profiler/android/src/commands/platforms/UnixProfiler.ts | ||
+++ b/node_modules/@perf-profiler/android/src/commands/platforms/UnixProfiler.ts | ||
@@ -26,7 +26,7 @@ export const CppProfilerName = `BAMPerfProfiler`; | ||
// into the Flipper plugin directory | ||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment | ||
// @ts-expect-error | ||
-const binaryFolder = global.Flipper | ||
+const binaryFolder = (global.Flipper || process.env.AWS) | ||
? `${__dirname}/bin` | ||
: `${__dirname}/../../..${__dirname.includes("dist") ? "/.." : ""}/cpp-profiler/bin`; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters