diff --git a/.github/workflows/check-snapshots.yml b/.github/workflows/check-snapshots.yml index 45e71fa..3e0f880 100644 --- a/.github/workflows/check-snapshots.yml +++ b/.github/workflows/check-snapshots.yml @@ -28,7 +28,7 @@ jobs: fail-fast: false matrix: today_minus_n_days: [0, 1, 2] - name: [big-merge] + name: [big-merge, pgo] include: # - name: standalone # maintainer_handle: "tbaederr" @@ -48,7 +48,7 @@ jobs: copr_ownername: "@fedora-llvm-team" copr_project_tpl: "llvm-snapshots-pgo-YYYYMMDD" copr_monitor_tpl: "https://copr.fedorainfracloud.org/coprs/g/fedora-llvm-team/llvm-snapshots-pgo-YYYYMMDD/monitor/" - chroot_pattern: 'fedora-40-x86_64' + chroot_pattern: '^(fedora-(rawhide|[0-9]+)|rhel-[8,9]-)' packages: "llvm" # - name: bootstrap # maintainer_handle: "kwk" diff --git a/.github/workflows/fedora-copr-build.yml b/.github/workflows/fedora-copr-build.yml index 4cfc0bf..461934c 100644 --- a/.github/workflows/fedora-copr-build.yml +++ b/.github/workflows/fedora-copr-build.yml @@ -23,7 +23,7 @@ jobs: - name: pgo copr_project_tpl: "@fedora-llvm-team/llvm-snapshots-pgo-YYYYMMDD" copr_target_project: "@fedora-llvm-team/llvm-snapshots-pgo" - extra_script_file: "scripts/functions-pgo.sh" + # extra_script_file: "scripts/functions-pgo.sh" clone_url_tpl: "https://src.fedoraproject.org/forks/kkleine/rpms/PKG.git" clone_ref: pgo runs-on: ubuntu-latest diff --git a/scripts/functions-pgo.sh b/scripts/functions-pgo.sh deleted file mode 100644 index 34b1e8d..0000000 --- a/scripts/functions-pgo.sh +++ /dev/null @@ -1,13 +0,0 @@ -# This file contains overwrite for the functions in functions.sh -set +x - -# Prints the chroots we care about. -function get_chroots() { - echo "fedora-40-x86_64" -} - -# Prints the packages we care about -# overwrite -function get_packages() { - echo "llvm" -} diff --git a/snapshot_manager/snapshot_manager/build_status.py b/snapshot_manager/snapshot_manager/build_status.py index 7dd2afd..ba9524e 100644 --- a/snapshot_manager/snapshot_manager/build_status.py +++ b/snapshot_manager/snapshot_manager/build_status.py @@ -105,7 +105,7 @@ def render_as_markdown(self) -> str: if self.url_build_log is None: link = f'build page' return f""" -
+
{self.package_name} on {self.chroot} (see {link}) diff --git a/snapshot_manager/tests/build_status_test.py b/snapshot_manager/tests/build_status_test.py index 09326a8..0b316bb 100644 --- a/snapshot_manager/tests/build_status_test.py +++ b/snapshot_manager/tests/build_status_test.py @@ -101,7 +101,7 @@ def test_render_as_markdown(self): ) expected = """ -
+
foo on fedora-40-x86_64 (see build log, contribute to log-detective) @@ -152,42 +152,42 @@ def test_render_as_markdown(self): actual = build_status.render_as_markdown(unsorted) expected = """