Merge pull request #116 from rhobs/coleenquadros-patch-3

Refactor asset handling and update Node for Prometheus syncbot

Author: coleenquadros

.github/workflows/merge-acm-flow.yaml

@@ -4,7 +4,7 @@ on:
     inputs:
       node-version:
         description: node version
-        default: '16'
+        default: '22'
         required: false
         type: string
       go-version:

.github/workflows/merge-acm-prometheus.yaml

@@ -20,23 +20,23 @@ jobs:
       downstream: stolostron/prometheus
       sandbox: rhobs/acm-prometheus
       go-version: "1.24"
+      restore-downstream: >-
+        plugins.yml
+        plugins
       restore-upstream: >-
         CHANGELOG.md
         VERSION
         go.mod
         go.sum
         .golangci.yml
-        discovery
-        promql
-        storage
       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/main web/ui; then
           make assets-compress
-          find web/ui/static -type f -name '*.gz' -exec git add -f {} \;
-          git add -f web/ui/embed.go
+          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"
         fi