rhobs · coleenquadros · Mar 4, 2026 · Mar 4, 2026 · Mar 4, 2026 · Mar 4, 2026
@@ -3,7 +3,7 @@ name: ACM Alertmanager merger
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 0 * * 1' #@weekly
+    - cron: '0 0 1,15 * *' #@biweekly
   pull_request:
     paths:
       - '.github/workflows/merge-acm-flow.yaml'
@@ -20,22 +20,11 @@ jobs:
       upstream: prometheus/alertmanager
       downstream: stolostron/prometheus-alertmanager
       sandbox: rhobs/acm-prometheus-alertmanager
-      go-version: "1.25"
       restore-upstream: >-
         CHANGELOG.md
         VERSION
         go.mod
         go.sum
-      assets-cmd: |
-        # Only compress assets if assets actually changed
-        # 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/master ui/react-app; then
-          make assets-compress
-          find ui/react-app -type f -name '*.gz' -exec git add {} \;
-          git add ui/react-app/embed.go
-          git diff --cached --exit-code || git commit -s -m "[bot] assets: generate"
-        fi
 
     secrets:
       pr-app-id: ${{ secrets.ACM_APP_ID }}

@@ -7,10 +7,6 @@ on:
         default: '22'
         required: false
         type: string
-      go-version:
-        description: go version
-        required: true
-        type: string
       upstream:
         description: Upstream repo path in owner/repo format
         required: true
@@ -137,12 +133,12 @@ jobs:
           repository: ${{ inputs.downstream }}
           fetch-depth: 0
           ref: ${{ inputs.downstream-branch }}
-      - name: Fetch all upstream tags
+      - name: Fetch upstream tag
         run: |
           git config user.name 'github-actions[bot]'
           git config user.email 'github-actions[bot]@users.noreply.github.com'
           git config --global core.editor "/bin/true"
-          git fetch https://github.com/${{ inputs.upstream }} --tags
+          git fetch https://github.com/${{ inputs.upstream }} tag ${{ steps.upstream.outputs.release }}
       - name: Merge with upstream ${{ steps.upstream.outputs.release }} tag
         id: merge
         run: |
@@ -166,10 +162,12 @@ jobs:
       - name: Resolve conflict due to deleted downstream files
         if: ${{ steps.merge.outputs.MERGE_CONFLICT == 'true' }}
         run: |
-            git status --porcelain | awk '{ if ($1=="DU") print $2 }' | xargs -I {} git rm {}
+          git status --porcelain | awk '{ if ($1=="UD" || $1=="DU" ||  $1=="U") print $2 }' | xargs -I {} git rm {}
       - name: Continue after merge conflict
         if: ${{ steps.merge.outputs.MERGE_CONFLICT == 'true' }}
-        run: git merge --continue
+        run: |
+          git add -A
+          git merge --continue
       - name: Add or update VERSION file
         run: |
           # All tags use the vX.Y.Z format currently.
@@ -191,7 +189,7 @@ jobs:
           git diff --cached --exit-code || git commit -s -m "[bot] add VERSION file with ${version_from_tag}"
       - uses: actions/setup-go@v5
         with:
-          go-version: ${{ inputs.go-version }}
+          go-version-file: go.mod
       - uses: actions/setup-node@v4
         with:
           node-version: ${{ inputs.node-version }}
@@ -242,11 +240,6 @@ jobs:
             go mod tidy
             go mod vendor
             ${{ inputs.assets-cmd }}
-            if [ -f scripts/rh-manifest.sh ]; then
-              bash scripts/rh-manifest.sh
-              git add rh-manifest.txt
-              git diff --cached --exit-code || git commit -s -m "[bot] update rh-manifest.txt"
-            fi
             ```
           author: 'github-actions[bot]<github-actions[bot]@users.noreply.github.com>'
           committer: 'github-actions[bot]<github-actions[bot]@users.noreply.github.com>'

@@ -3,7 +3,7 @@ name: ACM Grafana merger
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 0 * * 1' #@weekly
+    - cron: '0 0 1,15 * *' #@biweekly
   pull_request:
     paths:
     - '.github/workflows/merge-acm-flow.yaml'
@@ -19,7 +19,6 @@ jobs:
       upstream: grafana/grafana
       downstream: stolostron/grafana
       sandbox: rhobs/acm-grafana
-      go-version: "1.25"
       node-version: "22"
       go-mod-tidy: false
       restore-downstream: >-
@@ -58,10 +57,10 @@ jobs:
         go run ./pkg/build/wire/cmd/wire/main.go gen -tags oss ./pkg/server
 
         # Commit assets
-        git add pkg/server/wire_gen.go ./public/build ./public/app/plugins/datasource/*/dist/*
-        git diff --cached --exit-code || git commit -s -m "[bot] assets: generate"
+        git add pkg/server/wire_gen.go ./public/build ./public/app/plugins
+        git diff --cached --exit-code --name-only || git commit -s -m "[bot] assets: generate"
       downstream-version-expression: |
-        sed -n -E 's/^.*\"version\": *\"([0-9]+\.[0-9]+\.[0-9]+)\".*$/v\1/p' https://raw.githubusercontent.com/stolostron/grafana/release-2.12/package.json
+        sed -n -E 's/^.*\"version\": *\"([0-9]+\.[0-9]+\.[0-9]+)\".*$/v\1/p' https://raw.githubusercontent.com/stolostron/grafana/release-2.17/package.json
     secrets:
       pr-app-id: ${{ secrets.ACM_APP_ID }}
       pr-app-private-key: ${{ secrets.ACM_APP_PRIVATE_KEY }}

@@ -3,7 +3,7 @@ name: ACM kube-state-metrics merger
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 0 * * 1' #@weekly
+    - cron: '0 0 1,15 * *' #@biweekly
   pull_request:
     paths:
     - '.github/workflows/merge-acm-flow.yaml'
@@ -20,7 +20,6 @@ jobs:
       upstream: kubernetes/kube-state-metrics
       downstream: stolostron/kube-state-metrics
       sandbox: rhobs/acm-kube-state-metrics
-      go-version: "1.25"
       restore-upstream: >-
         CHANGELOG.md
       restore-downstream: >-

@@ -3,7 +3,7 @@ name: ACM Memcached exporter merger
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 0 * * 1' #@weekly
+    - cron: '0 0 1,15 * *' #@biweekly
   pull_request:
     paths:
     - '.github/workflows/merge-acm-flow.yaml'
@@ -19,7 +19,6 @@ jobs:
       upstream: prometheus/memcached_exporter
       downstream: stolostron/memcached_exporter
       sandbox: rhobs/acm-memcached_exporter
-      go-version: "1.25"
       restore-downstream: >-
          OWNERS
       restore-upstream: >-

@@ -3,7 +3,7 @@ name: ACM Node exporter merger
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 0 * * 1' #@weekly
+    - cron: '0 0 1,15 * *' #@biweekly
   pull_request:
     paths:
     - '.github/workflows/merge-acm-flow.yaml'
@@ -19,7 +19,6 @@ jobs:
       upstream: prometheus/node_exporter
       downstream: stolostron/node-exporter
       sandbox: rhobs/acm-node-exporter
-      go-version: "1.25"
       restore-downstream: >-
          OWNERS
       restore-upstream: >-

@@ -3,7 +3,7 @@ name: ACM Prometheus Operator merger
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 0 * * 1' #@weekly
+    - cron: '0 0 1,15 * *' #@biweekly
   pull_request:
     paths:
     - '.github/workflows/merge-acm-flow.yaml'
@@ -19,7 +19,6 @@ jobs:
       upstream: prometheus-operator/prometheus-operator
       downstream: stolostron/prometheus-operator
       sandbox: rhobs/acm-prometheus-operator
-      go-version: "1.25"
       restore-upstream: >-
         CHANGELOG.md
         Documentation

@@ -3,7 +3,7 @@ name: ACM Prometheus merger
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 0 * * 1' #@weekly
+    - cron: '0 0 1,15 * *' #@biweekly
   pull_request:
     paths:
     - '.github/workflows/merge-acm-flow.yaml'
@@ -19,25 +19,30 @@ jobs:
       upstream: prometheus/prometheus
       downstream: stolostron/prometheus
       sandbox: rhobs/acm-prometheus
-      go-version: "1.25"
+      go-mod-tidy: false
       restore-downstream: >-
         plugins.yml
         plugins
       restore-upstream: >-
         CHANGELOG.md
+        Makefile
         VERSION
         go.mod
         go.sum
         .golangci.yml
       assets-cmd: |
+        # Force upstream Makefile in case of conflicts
+        git checkout --theirs Makefile || true
+        git add Makefile || true
         # Only compress assets if assets actually changed
         # 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
+        if ! git diff --exit-code --name-only  origin/main web/ui; then
+          rm -rf web/ui/static
           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"
+          git add web/ui
+          git diff --cached --exit-code --name-only || git commit -s -m "[bot] assets: generate"
         fi
 
     secrets:

@@ -3,7 +3,7 @@ name: ACM Thanos merger
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 0 * * 1' #@weekly
+    - cron: '0 0 1,15 * *' #@biweekly
   pull_request:
     paths:
     - '.github/workflows/merge-acm-flow.yaml'
@@ -19,7 +19,7 @@ jobs:
       upstream: thanos-io/thanos
       downstream: stolostron/thanos
       sandbox: rhobs/acm-thanos
-      go-version: "1.25"
+      go-mod-tidy: false
       restore-downstream: >-
         OWNERS
       restore-upstream: >-