Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 1 addition & 18 deletions .github/workflows/build-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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:
Expand Down
6 changes: 0 additions & 6 deletions .packit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions config/bluefin-packages.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ packages = [
"firewall-config",
"fish",
"flatpak-spawn",
"firefox",
"fzf",
"gcc",
"gcc-c++",
Expand Down Expand Up @@ -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",
Expand Down
8 changes: 0 additions & 8 deletions config/upstream-sources.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions tests/test_package_inventory.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()


Expand Down
2 changes: 1 addition & 1 deletion tests/test_packit_srpm.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down
2 changes: 1 addition & 1 deletion tests/test_render_packit_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__":
Expand Down
2 changes: 1 addition & 1 deletion tests/test_source_inventory.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down