Refactor macOS build workflow to remove specific .app cleanup and delete unused telemetry build scripts

This commit is contained in:
mr. M
2025-01-26 15:57:11 +01:00
parent 9c5ae70562
commit d9939ea9be
2 changed files with 3 additions and 42 deletions

View File

@@ -127,8 +127,9 @@ jobs:
- name: Remove any existing .app folders
run: |
set -x
rm -rf "./obj-x86_64-apple-darwin/dist/zen/*.app"
rm -rf "./obj-aarch64-apple-darwin/dist/zen/*.app"
cd engine
rm -rf "./obj-x86_64-apple-darwin/dist/zen/${{ env.APP_NAME }}.app"
rm -rf "./obj-aarch64-apple-darwin/dist/zen/${{ env.APP_NAME }}.app"
- name: Extract .app from dmg
run: |

View File

@@ -1,40 +0,0 @@
diff --git a/toolkit/components/telemetry/moz.build b/toolkit/components/telemetry/moz.build
index baaddec36152f073ff76b3c5f8e0b6459a9f66b8..d374d3688d829989d3e255e755320635dafacaa0 100644
--- a/toolkit/components/telemetry/moz.build
+++ b/toolkit/components/telemetry/moz.build
@@ -192,17 +192,7 @@ GeneratedFile(
inputs=scalar_files,
)
-# Generate the JSON scalar definitions. They will only be
-# used in artifact or "build faster" builds.
-GeneratedFile(
- "ScalarArtifactDefinitions.json",
- script="build_scripts/gen_scalar_data.py",
- entry_point="generate_JSON_definitions",
- inputs=scalar_files,
-)
-# Move the scalars JSON file to the directory where the Firefox binary is.
-FINAL_TARGET_FILES += ["!ScalarArtifactDefinitions.json"]
# Generate event files.
event_files = [
@@ -221,17 +211,7 @@ GeneratedFile(
inputs=event_files,
)
-# Generate the JSON event definitions. They will only be
-# used in artifact or "build faster" builds.
-GeneratedFile(
- "EventArtifactDefinitions.json",
- script="build_scripts/gen_event_data.py",
- entry_point="generate_JSON_definitions",
- inputs=event_files,
-)
-# Move the events JSON file to the directory where the Firefox binary is.
-FINAL_TARGET_FILES += ["!EventArtifactDefinitions.json"]
# Generate data from Processes.yaml
processes_files = [