From f096dc129eed9d22df9f6d901f1a287e4996e335 Mon Sep 17 00:00:00 2001 From: mendezr Date: Mon, 14 Sep 2026 20:01:29 +0000 Subject: [PATCH] fix(firefox): drop firefox from the rebuild set, ship via flatpak Firefox is shipped through the flatpak and does not need to be rebuilt here. The recipe directory was already deleted upstream; finish removing the firefox references from the build wiring: - config/upstream-sources.json: drop the firefox source lock entry - .packit.yaml: drop the firefox package block - config/bluefin-packages.toml: remove firefox from the base image package list and firefox-langpacks from the exclusion list - .github/workflows/build-stage.yml: drop the now-unused Firefox PGO/LTO swap workaround - tests/: track the 192 -> 191 package counts closes #112 Signed-off-by: mendezr --- .github/workflows/build-stage.yml | 19 +------------------ .packit.yaml | 6 ------ config/bluefin-packages.toml | 2 -- config/upstream-sources.json | 8 -------- tests/test_package_inventory.py | 6 +++--- tests/test_packit_srpm.py | 2 +- tests/test_render_packit_config.py | 2 +- tests/test_source_inventory.py | 2 +- 8 files changed, 7 insertions(+), 40 deletions(-) diff --git a/.github/workflows/build-stage.yml b/.github/workflows/build-stage.yml index 6a30e6c00..61e4d8f2c 100644 --- a/.github/workflows/build-stage.yml +++ b/.github/workflows/build-stage.yml @@ -3,9 +3,7 @@ # rebuild0 through rebuild4 were five copies of this file, differing only in a # stage number and a `needs:` list -- four substantive lines out of roughly two # hundred. Five copies meant five places to fix a build-root bug, and the -# copies had already drifted: the Firefox swap workaround existed only in -# stage 0, so it would have silently stopped applying the moment Firefox was -# solved into a later wave. +# copies had already drifted. # # The caller owns ordering. This workflow builds one wave and knows nothing # about the others beyond the artifacts they left behind. @@ -36,21 +34,6 @@ jobs: steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 - uses: ./.github/actions/setup-sccache - - name: Add best-effort swap for Firefox PGO/LTO - if: matrix.package == 'firefox' - run: | - set -euo pipefail - available_gib=$(df --output=avail -BG "$RUNNER_TEMP" | tail -n1 | tr -dc 0-9) - if [ "$available_gib" -lt 20 ]; then - echo "Only ${available_gib} GiB free; skipping extra swap to preserve build disk" >&2 - exit 0 - fi - swapfile="$RUNNER_TEMP/firefox-pgo.swap" - sudo fallocate -l 12G "$swapfile" - sudo chmod 600 "$swapfile" - sudo mkswap "$swapfile" - sudo swapon "$swapfile" || { echo "Host does not permit extra swap" >&2; exit 0; } - free -h - name: Collect RPMs built by earlier stages uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8 with: diff --git a/.packit.yaml b/.packit.yaml index edd612025..ad27c4036 100755 --- a/.packit.yaml +++ b/.packit.yaml @@ -142,12 +142,6 @@ packages: downstream_package_name: fastfetch paths: - packages/fastfetch - firefox: - specfile_path: firefox.spec - upstream_package_name: firefox - downstream_package_name: firefox - paths: - - packages/firefox firewalld: specfile_path: firewalld.spec upstream_package_name: firewalld diff --git a/config/bluefin-packages.toml b/config/bluefin-packages.toml index 8d5ef38f5..f72bf1997 100644 --- a/config/bluefin-packages.toml +++ b/config/bluefin-packages.toml @@ -46,7 +46,6 @@ packages = [ "firewall-config", "fish", "flatpak-spawn", - "firefox", "fzf", "gcc", "gcc-c++", @@ -120,7 +119,6 @@ packages = [ "fedora-chromium-config", "fedora-chromium-config-gnome", "fedora-third-party", - "firefox-langpacks", "gnome-extensions-app", "gnome-shell-extension-background-logo", "gnome-software", diff --git a/config/upstream-sources.json b/config/upstream-sources.json index edcc4ccfc..af531166f 100644 --- a/config/upstream-sources.json +++ b/config/upstream-sources.json @@ -149,14 +149,6 @@ "filename": "fastfetch-2.66.0.tar.gz", "sha512": "dc067be6742b1193a6f7719333ecd418289c23b2c8ffc7f603eb9dd39b3b279536edcb87bc0e00f1a3a1a6f581e290b89e8cc5acd40a806bef1ba141b45d34c5" }, - { - "name": "firefox", - "version": "155.0", - "url": "https://src.fedoraproject.org/repo/pkgs/rpms/firefox/firefox-155.0.source.tar.xz/sha512/24292681924edb9f0494eb77a7b19994039abbc3a8c0ba304f0e472b49a943838565723de983bc8ef08e019971e02a3014c8d241bb88c645a06a625c8ace0d6a/firefox-155.0.source.tar.xz", - "filename": "firefox-155.0.source.tar.xz", - "sha512": "24292681924edb9f0494eb77a7b19994039abbc3a8c0ba304f0e472b49a943838565723de983bc8ef08e019971e02a3014c8d241bb88c645a06a625c8ace0d6a", - "stage": 4 - }, { "name": "flatpak-xdg-utils", "version": "1.0.6", diff --git a/tests/test_package_inventory.py b/tests/test_package_inventory.py index c738bc323..bbc9704cd 100644 --- a/tests/test_package_inventory.py +++ b/tests/test_package_inventory.py @@ -14,9 +14,9 @@ class PackageInventoryTests(unittest.TestCase): def test_inventory_reports_every_recipe_fully_source_locked(self): records = inventory(ROOT) - # 192: gcc was dropped from the rebuild set (projectbluefin/utah-packages#69); - # Hummingbird supplies the identical gcc-16.2.1, so it is no longer built here. - assert len(records) == 192 + # 191: gcc was dropped from the rebuild set (projectbluefin/utah-packages#69) and + # firefox was dropped (projectbluefin/utah-packages#112, shipped via the flatpak). + assert len(records) == 191 assert {r.name for r in records if not r.source_locked} == set() diff --git a/tests/test_packit_srpm.py b/tests/test_packit_srpm.py index bf6cf192d..464b2a725 100644 --- a/tests/test_packit_srpm.py +++ b/tests/test_packit_srpm.py @@ -24,7 +24,7 @@ def test_workflow_stages_verified_sources_for_every_configured_package(self) -> for package in json.loads(SOURCE_CONFIG.read_text())["packages"] } - self.assertEqual(len(config_packages), 192) + self.assertEqual(len(config_packages), 191) self.assertEqual(config_packages - source_packages, set()) self.assertTrue( {"adw-gtk3-theme", "bootc", "igt-gpu-tools", "mesa", "runc"} diff --git a/tests/test_render_packit_config.py b/tests/test_render_packit_config.py index 8e35b2818..88b1ef439 100644 --- a/tests/test_render_packit_config.py +++ b/tests/test_render_packit_config.py @@ -11,7 +11,7 @@ class RenderPackitConfigTests(unittest.TestCase): def test_rendered_config_matches_repository_file(self): self.assertEqual(render(ROOT), (ROOT / ".packit.yaml").read_text()) - self.assertEqual(render(ROOT).count(" specfile_path:"), 192) + self.assertEqual(render(ROOT).count(" specfile_path:"), 191) if __name__ == "__main__": diff --git a/tests/test_source_inventory.py b/tests/test_source_inventory.py index 3b568e781..240af2a4e 100644 --- a/tests/test_source_inventory.py +++ b/tests/test_source_inventory.py @@ -68,7 +68,7 @@ class TargetSelectionTests(unittest.TestCase): def test_hummingbird_supplied_packages_are_skipped_by_default(self): targets = plan_targets(ROOT / "packages", {"dracut": ["dracut"]}) self.assertNotIn("dracut", [path.name for path in targets]) - self.assertEqual(len(targets), 191) + self.assertEqual(len(targets), 190) def test_explicit_selection_processes_a_hummingbird_supplied_package(self): targets = plan_targets(ROOT / "packages", {"dracut": ["dracut"]}, only="dracut")