From 53ccad3c5779a18518a1f230b3d732e165e4226c Mon Sep 17 00:00:00 2001 From: Ayoub Mrini Date: Fri, 24 Apr 2026 16:52:05 +0200 Subject: [PATCH 1/4] chore(prometehus): drop restore-downstream --- .github/workflows/merge-prometheus.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/merge-prometheus.yaml b/.github/workflows/merge-prometheus.yaml index a45a3f3..3dabb1d 100644 --- a/.github/workflows/merge-prometheus.yaml +++ b/.github/workflows/merge-prometheus.yaml @@ -19,9 +19,6 @@ jobs: upstream: prometheus/prometheus downstream: openshift/prometheus sandbox: rhobs/prometheus - restore-downstream: >- - plugins.yml - plugins restore-upstream: >- CHANGELOG.md VERSION From 44a14b9a4aa87fb51efad1b00bfaeefc40546613 Mon Sep 17 00:00:00 2001 From: Ayoub Mrini Date: Fri, 24 Apr 2026 17:25:33 +0200 Subject: [PATCH 2/4] chore(prometheus): add .github/PULL_REQUEST_TEMPLATE.md to restore-downstream --- .github/workflows/merge-prometheus.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/merge-prometheus.yaml b/.github/workflows/merge-prometheus.yaml index 3dabb1d..f3c1bc0 100644 --- a/.github/workflows/merge-prometheus.yaml +++ b/.github/workflows/merge-prometheus.yaml @@ -19,6 +19,8 @@ jobs: upstream: prometheus/prometheus downstream: openshift/prometheus sandbox: rhobs/prometheus + restore-downstream: >- + .github/PULL_REQUEST_TEMPLATE.md restore-upstream: >- CHANGELOG.md VERSION From 4c5604d434921cd3849ffb73958526d5541c02c8 Mon Sep 17 00:00:00 2001 From: Ayoub Mrini Date: Tue, 28 Apr 2026 11:59:58 +0200 Subject: [PATCH 3/4] chore(prometheus): only build mantime UI making use of https://github.com/prometheus/prometheus/pull/18223 --- .github/workflows/merge-prometheus.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/merge-prometheus.yaml b/.github/workflows/merge-prometheus.yaml index f3c1bc0..1c8a517 100644 --- a/.github/workflows/merge-prometheus.yaml +++ b/.github/workflows/merge-prometheus.yaml @@ -32,7 +32,8 @@ jobs: # The git diff relies on gits remote naming. The merge-flow checks out # $downstream as origin at the time of writing this code. if ! git diff --exit-code origin/main web/ui; then - make assets-compress + # Only build the Mantine UI. + BUILD_UI=mantine make assets-compress find web/ui/static -type f -name '*.gz' -exec git add {} \; git add web/ui/embed.go git diff --cached --exit-code || git commit -s -m "[bot] assets: generate" From ae957caa2ac63ae7a0aa6c458baa762f3e5e4db3 Mon Sep 17 00:00:00 2001 From: Ayoub Mrini Date: Tue, 28 Apr 2026 12:15:18 +0200 Subject: [PATCH 4/4] chore(prometheus): only grab assets from web/ui/static/mantine-ui --- .github/workflows/merge-prometheus.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-prometheus.yaml b/.github/workflows/merge-prometheus.yaml index 1c8a517..d2bdf41 100644 --- a/.github/workflows/merge-prometheus.yaml +++ b/.github/workflows/merge-prometheus.yaml @@ -34,7 +34,7 @@ jobs: if ! git diff --exit-code origin/main web/ui; then # Only build the Mantine UI. BUILD_UI=mantine make assets-compress - find web/ui/static -type f -name '*.gz' -exec git add {} \; + find web/ui/static/mantine-ui -type f -name '*.gz' -exec git add {} \; git add web/ui/embed.go git diff --cached --exit-code || git commit -s -m "[bot] assets: generate" fi