fix assets build for prometheus and grafana

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

Author: coleenquadros

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

@@ -162,7 +162,7 @@ jobs:
       - name: Resolve conflict due to deleted downstream files
         if: ${{ steps.merge.outputs.MERGE_CONFLICT == 'true' }}
         run: |
-          git status --porcelain | awk '{ if ($1=="UD" || $1=="DU" || $1=="UU" || $1=="U") 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: |

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

@@ -57,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 add pkg/server/wire_gen.go ./public/build ./public/app/plugins/
         git diff --cached --exit-code || 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 }}

.github/workflows/merge-prometheus.yaml

@@ -35,7 +35,7 @@ jobs:
         if ! git diff --exit-code origin/main web/ui; then
           make assets-compress
           find web/ui/static -type f -name '*.gz' -exec git add {} \;
-          git add web/ui/embed.go
+          git add web/ui/
           git diff --cached --exit-code || git commit -s -m "[bot] assets: generate"
         fi