Actions: Fix grafana-com JSON construction (#672)

Author: Proximyst

.github/workflows/build-plugin.yaml

@@ -40,7 +40,7 @@ jobs:
       - run: yarn run build
 
       - name: Package
-        run: ./scripts/package_target.sh ${{ matrix.target }} false ${{ matrix.target }}/
+        run: ./scripts/package_target.sh ${{ matrix.target }} false plugin-${{ matrix.target }}/
 
       - name: Acquire Grafana API key
         id: grafana_api_key
@@ -49,25 +49,23 @@ jobs:
           repo_secrets: |
             GRAFANA_ACCESS_POLICY_TOKEN=gcom-token:token
       - name: Sign package
-        run: yarn sign-plugin --distDir ./dist/${{ matrix.target }}/
+        run: yarn sign-plugin --distDir ./dist/plugin-${{ matrix.target }}/
 
       - name: Create ZIP
         working-directory: dist/
-        run: zip -yqr ${{ matrix.target }}.zip ${{ matrix.target }}/
+        run: zip -yqr plugin-${{ matrix.target }}.zip plugin-${{ matrix.target }}/
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.target }}.zip
-          path: dist/${{ matrix.target }}.zip
+          name: plugin-${{ matrix.target }}.zip
+          path: dist/plugin-${{ matrix.target }}.zip
 
-  release:
+  generate:
     needs: build
-    if: github.event_name == 'push' && github.ref_type == 'tag'
-    name: Release plugin
+    name: Generate plugin metadata
     runs-on: ubuntu-latest
     permissions:
-      contents: write # create a release
-      id-token: write # required to read secrets
+      contents: read # clone the repository
     steps:
       - uses: actions/checkout@v4
         with:
@@ -77,10 +75,11 @@ jobs:
         with:
           merge-multiple: true
           path: artifacts/
+          pattern: plugin-*.zip
+
       # FIXME: Why do we use MD5?? Why not SHA-2/SHA-512?
       - name: Generate MD5 sums
         run: ./scripts/generate_md5sum.sh artifacts/
-
       - name: Create Gcom API plugin JSON payload
         env:
           COMMIT: ${{ github.sha }}
@@ -90,7 +89,52 @@ jobs:
           cat artifacts/md5sums.txt | jq --slurp --raw-input \
             --arg commit "$COMMIT" \
             --arg baseUrl "$BASE_URL" \
-            'split("\n")[:-1] | map(split("  ")) | map({(.[1] | sub("^artifacts/"; "")): .[0]}) | add | { commit: $commit, url: $baseUrl, download: .}' | tee gcom.json
+            'split("\n")[:-1]
+            | map(split("  "))
+            | map({
+                (
+                  .[1]
+                  | sub("^artifacts/"; "")
+                  | sub(".zip$"; "")
+                  | sub("plugin-"; "")
+                  | sub("win32"; "windows")
+                  | sub("x64"; "amd64")
+                  | sub("-unknown"; "")
+                  | sub("-glibc"; "")
+                ): .[0]
+              })
+            | add
+            | { commit: $commit, url: $baseUrl, download: .}' | tee gcom.json
+      - name: Upload generated artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: generated-artifacts
+          path: |
+            gcom.json
+            artifacts/md5sums.txt
+
+  release:
+    needs: [build, generate]
+    if: github.event_name == 'push' && github.ref_type == 'tag'
+    name: Release plugin
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write # create a release
+      id-token: write # required to read secrets
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+
+      - uses: actions/download-artifact@v4
+        with:
+          merge-multiple: true
+          path: artifacts/
+          pattern: plugin-*.zip
+
+      - uses: actions/download-artifact@v4
+        with:
+          name: generated-artifacts
 
       - name: Acquire Grafana API key
         id: grafana_api_key
@@ -103,7 +147,7 @@ jobs:
         with:
           files: |
             artifacts/*.zip
-            artifacts/md5sums.txt
+            md5sums.txt
           fail_on_unmatched_files: true
           make_latest: 'true'
           generate_release_notes: true

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 4.0.1 (2025-07-22)
+
+This release only touches the build process of the plugin, as v4.0.0 did not release on the plugin catalog.
+There is no difference from v4.0.0 for Docker users.
+
 ## 4.0.0 (2025-07-22)
 
 - Build: Update all dependencies, [#663](https://github.com/grafana/grafana-image-renderer/pull/663), [Proximyst](https://github.com/Proximyst)

plugin.json

@@ -24,7 +24,7 @@
         "url": "https://github.com/grafana/grafana-image-renderer/blob/master/LICENSE"
       }
     ],
-    "version": "4.0.0",
+    "version": "4.0.1",
     "updated": "2025-07-22"
   },
   "dependencies": {