From ee3114db8e1210e76c76794dc1e706e1044b34be Mon Sep 17 00:00:00 2001 From: David Harder Date: Sat, 11 Jan 2025 21:11:40 -0600 Subject: [PATCH] [NFC] repo-wide: Replace montoring.yml with monitoring.yaml **Summary** - Previous commit handled all the renames, this commit chnages: - Comment text in some monitoring files - The taskfile task for a new monitoring file - The CI check for monitoring file existence --- Taskfile.yml | 6 +++--- common/CI/package_checks.py | 4 ++-- packages/a/appstream-data/monitoring.yaml | 2 +- packages/f/ffmpeg-chromium-opera/monitoring.yaml | 2 +- packages/f/ffmpeg-chromium-vivaldi-stable/monitoring.yaml | 2 +- packages/f/ffmpeg-chromium/monitoring.yaml | 2 +- packages/p/piksemel/monitoring.yaml | 2 +- packages/py/python-gobject2/monitoring.yaml | 2 +- packages/py/python2-gobject/monitoring.yaml | 2 +- packages/w/webrtc-audio-processing03/monitoring.yaml | 2 +- packages/w/woff-tools/monitoring.yaml | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Taskfile.yml b/Taskfile.yml index de41bc7d2d..aa9aaac518 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -295,14 +295,14 @@ tasks: - common/Scripts/check_appstream_progress.py packages add-monitoring: - desc: Add skeleton for monitoring.yml + desc: Add skeleton for monitoring.yaml dir: '{{ .USER_WORKING_DIR }}' vars: DATE: sh: date -u +%Y-%m-%d COMMENT: "# No known CPE, checked {{ .DATE }}" cmds: - - touch monitoring.yml + - touch monitoring.yaml - yq --inplace ' . head_comment="Remove all comments before submitting, except CPE check date if none found" | .releases.id line_comment = "Check https://release-monitoring.org/" | @@ -310,4 +310,4 @@ tasks: .releases.[] = ~ | (.security | key) head_comment = "{{ .COMMENT }}" | .security.cpe = ~ - ' monitoring.yml + ' monitoring.yaml diff --git a/common/CI/package_checks.py b/common/CI/package_checks.py index 604b927460..242cccf000 100755 --- a/common/CI/package_checks.py +++ b/common/CI/package_checks.py @@ -421,7 +421,7 @@ class Homepage(PullRequestCheck): class Monitoring(PullRequestCheck): - _error = '`monitoring.yml` is missing' + _error = '`monitoring.yaml` is missing' _level = Level.WARNING def run(self) -> List[Result]: @@ -430,7 +430,7 @@ class Monitoring(PullRequestCheck): if not self._has_monitoring_yml(f)] def _has_monitoring_yml(self, file: str) -> bool: - return self._exists(os.path.join(os.path.dirname(file), 'monitoring.yml')) + return self._exists(os.path.join(os.path.dirname(file), 'monitoring.yaml')) class PackageBumped(PullRequestCheck): diff --git a/packages/a/appstream-data/monitoring.yaml b/packages/a/appstream-data/monitoring.yaml index ef8a0292c4..54b2f0ea17 100644 --- a/packages/a/appstream-data/monitoring.yaml +++ b/packages/a/appstream-data/monitoring.yaml @@ -1,4 +1,4 @@ -# This package will never benefit from a monitoring.yml please do not attempt to edit any of the fields. +# This package will never benefit from a monitoring.yaml please do not attempt to edit any of the fields. # https://github.com/getsolus/packages/issues/4533 releases: id: ~ diff --git a/packages/f/ffmpeg-chromium-opera/monitoring.yaml b/packages/f/ffmpeg-chromium-opera/monitoring.yaml index ef8a0292c4..54b2f0ea17 100644 --- a/packages/f/ffmpeg-chromium-opera/monitoring.yaml +++ b/packages/f/ffmpeg-chromium-opera/monitoring.yaml @@ -1,4 +1,4 @@ -# This package will never benefit from a monitoring.yml please do not attempt to edit any of the fields. +# This package will never benefit from a monitoring.yaml please do not attempt to edit any of the fields. # https://github.com/getsolus/packages/issues/4533 releases: id: ~ diff --git a/packages/f/ffmpeg-chromium-vivaldi-stable/monitoring.yaml b/packages/f/ffmpeg-chromium-vivaldi-stable/monitoring.yaml index ef8a0292c4..54b2f0ea17 100644 --- a/packages/f/ffmpeg-chromium-vivaldi-stable/monitoring.yaml +++ b/packages/f/ffmpeg-chromium-vivaldi-stable/monitoring.yaml @@ -1,4 +1,4 @@ -# This package will never benefit from a monitoring.yml please do not attempt to edit any of the fields. +# This package will never benefit from a monitoring.yaml please do not attempt to edit any of the fields. # https://github.com/getsolus/packages/issues/4533 releases: id: ~ diff --git a/packages/f/ffmpeg-chromium/monitoring.yaml b/packages/f/ffmpeg-chromium/monitoring.yaml index ef8a0292c4..54b2f0ea17 100644 --- a/packages/f/ffmpeg-chromium/monitoring.yaml +++ b/packages/f/ffmpeg-chromium/monitoring.yaml @@ -1,4 +1,4 @@ -# This package will never benefit from a monitoring.yml please do not attempt to edit any of the fields. +# This package will never benefit from a monitoring.yaml please do not attempt to edit any of the fields. # https://github.com/getsolus/packages/issues/4533 releases: id: ~ diff --git a/packages/p/piksemel/monitoring.yaml b/packages/p/piksemel/monitoring.yaml index ef8a0292c4..54b2f0ea17 100644 --- a/packages/p/piksemel/monitoring.yaml +++ b/packages/p/piksemel/monitoring.yaml @@ -1,4 +1,4 @@ -# This package will never benefit from a monitoring.yml please do not attempt to edit any of the fields. +# This package will never benefit from a monitoring.yaml please do not attempt to edit any of the fields. # https://github.com/getsolus/packages/issues/4533 releases: id: ~ diff --git a/packages/py/python-gobject2/monitoring.yaml b/packages/py/python-gobject2/monitoring.yaml index ef8a0292c4..54b2f0ea17 100644 --- a/packages/py/python-gobject2/monitoring.yaml +++ b/packages/py/python-gobject2/monitoring.yaml @@ -1,4 +1,4 @@ -# This package will never benefit from a monitoring.yml please do not attempt to edit any of the fields. +# This package will never benefit from a monitoring.yaml please do not attempt to edit any of the fields. # https://github.com/getsolus/packages/issues/4533 releases: id: ~ diff --git a/packages/py/python2-gobject/monitoring.yaml b/packages/py/python2-gobject/monitoring.yaml index ef8a0292c4..54b2f0ea17 100644 --- a/packages/py/python2-gobject/monitoring.yaml +++ b/packages/py/python2-gobject/monitoring.yaml @@ -1,4 +1,4 @@ -# This package will never benefit from a monitoring.yml please do not attempt to edit any of the fields. +# This package will never benefit from a monitoring.yaml please do not attempt to edit any of the fields. # https://github.com/getsolus/packages/issues/4533 releases: id: ~ diff --git a/packages/w/webrtc-audio-processing03/monitoring.yaml b/packages/w/webrtc-audio-processing03/monitoring.yaml index ef8a0292c4..54b2f0ea17 100644 --- a/packages/w/webrtc-audio-processing03/monitoring.yaml +++ b/packages/w/webrtc-audio-processing03/monitoring.yaml @@ -1,4 +1,4 @@ -# This package will never benefit from a monitoring.yml please do not attempt to edit any of the fields. +# This package will never benefit from a monitoring.yaml please do not attempt to edit any of the fields. # https://github.com/getsolus/packages/issues/4533 releases: id: ~ diff --git a/packages/w/woff-tools/monitoring.yaml b/packages/w/woff-tools/monitoring.yaml index ef8a0292c4..54b2f0ea17 100644 --- a/packages/w/woff-tools/monitoring.yaml +++ b/packages/w/woff-tools/monitoring.yaml @@ -1,4 +1,4 @@ -# This package will never benefit from a monitoring.yml please do not attempt to edit any of the fields. +# This package will never benefit from a monitoring.yaml please do not attempt to edit any of the fields. # https://github.com/getsolus/packages/issues/4533 releases: id: ~