From a0f236b6f72dea381eb65f160ce95a09d7f7f3c6 Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@mozilla.com>
Date: Tue, 20 May 2025 08:49:54 +0000
Subject: [PATCH] Bug 1967217 - stop running mach repackage desktop-file in
 linux repackage tasks. r=releng-reviewers,taskgraph-reviewers,bhearsum

This has been unused since bug 1949464 which removed the
release-flatpak-repackage task kind, as have the
release_flatpak_repackage transforms.

Differential Revision: https://phabricator.services.mozilla.com/D250005
---
 .../transforms/release_flatpak_repackage.py   | 62 -------------------
 .../gecko_taskgraph/transforms/repackage.py   | 13 ----
 taskcluster/kinds/repackage/kind.yml          |  2 +-
 3 files changed, 1 insertion(+), 76 deletions(-)
 delete mode 100644 taskcluster/gecko_taskgraph/transforms/release_flatpak_repackage.py

diff --git a/taskcluster/gecko_taskgraph/transforms/release_flatpak_repackage.py b/taskcluster/gecko_taskgraph/transforms/release_flatpak_repackage.py
deleted file mode 100644
index 1f27ae312213..000000000000
--- a/taskcluster/gecko_taskgraph/transforms/release_flatpak_repackage.py
+++ /dev/null
@@ -1,62 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-from taskgraph.transforms.base import TransformSequence
-from taskgraph.util.schema import resolve_keyed_by
-from taskgraph.util.taskcluster import get_artifact_url
-
-from gecko_taskgraph.util.attributes import release_level
-from gecko_taskgraph.util.scriptworker import get_release_config
-
-transforms = TransformSequence()
-
-
-@transforms.add
-def format(config, tasks):
-    """Apply format substitution to worker.env and worker.command."""
-
-    format_params = {
-        "release_config": get_release_config(config),
-        "config_params": config.params,
-    }
-
-    for task in tasks:
-        format_params["task"] = task
-
-        command = task.get("worker", {}).get("command", [])
-        task["worker"]["command"] = [x.format(**format_params) for x in command]
-
-        env = task.get("worker", {}).get("env", {})
-        for k in env.keys():
-            resolve_keyed_by(
-                env,
-                k,
-                "flatpak envs",
-                **{
-                    "release-level": release_level(config.params["project"]),
-                    "project": config.params["project"],
-                },
-            )
-            task["worker"]["env"][k] = env[k].format(**format_params)
-
-        yield task
-
-
-@transforms.add
-def add_desktop_file_url(config, tasks):
-    """Add desktop file artifact url to task environment"""
-    for task in tasks:
-        for dep_task in config.kind_dependencies_tasks.values():
-            if dep_task.label not in task["dependencies"]:
-                continue
-            if dep_task.kind != "repackage":
-                continue
-            env = task["worker"]["env"]
-            assert "DESKTOP_FILE_URL" not in env
-            env["DESKTOP_FILE_URL"] = {
-                "task-reference": get_artifact_url(
-                    f"<{dep_task.label}>", "public/build/target.flatpak.desktop"
-                )
-            }
-        yield task
diff --git a/taskcluster/gecko_taskgraph/transforms/repackage.py b/taskcluster/gecko_taskgraph/transforms/repackage.py
index c9a0d75f8fdc..a19019f0f97b 100644
--- a/taskcluster/gecko_taskgraph/transforms/repackage.py
+++ b/taskcluster/gecko_taskgraph/transforms/repackage.py
@@ -335,19 +335,6 @@ PACKAGE_FORMATS = {
         },
         "output": "target.rpm",
     },
-    "desktop-file": {
-        "args": [
-            "desktop-file",
-            "--flavor",
-            "flatpak",
-            "--release-product",
-            "firefox",
-            "--release-type",
-            "{release_type}",
-        ],
-        "inputs": {},
-        "output": "target.flatpak.desktop",
-    },
     "flatpak": {
         "args": [
             "flatpak",
diff --git a/taskcluster/kinds/repackage/kind.yml b/taskcluster/kinds/repackage/kind.yml
index 16293ab02e07..96b327f7ed8a 100644
--- a/taskcluster/kinds/repackage/kind.yml
+++ b/taskcluster/kinds/repackage/kind.yml
@@ -93,7 +93,7 @@ tasks:
                         # Debug builds can't be attributable
                         debug: [dmg, mar, pkg]
                         default: [dmg-attrib, mar, pkg]
-                linux.*: [mar, desktop-file]
+                linux.*: [mar]
                 win32\b.*: [mar, installer]
                 win64\b.*: [mar, installer]
         fetches: