fix-release-script (#16)

Author: chicco785

.github/workflows/release.yml

@@ -117,13 +117,13 @@ jobs:
           md5sum ${{ steps.metadata.outputs.archive }} > ${{ steps.metadata.outputs.archive-checksum }}
           echo "::set-output name=checksum::$(cat ./${{ steps.metadata.outputs.archive-checksum }} | cut -d' ' -f1)"
 
-      # - name: Lint plugin
-      #   run: |
-      #     git clone https://github.com/grafana/plugin-validator
-      #     pushd ./plugin-validator/pkg/cmd/plugincheck
-      #     go install
-      #     popd
-      #     plugincheck ${{ steps.metadata.outputs.archive }}
+      - name: Lint plugin
+        run: |
+          git clone https://github.com/grafana/plugin-validator
+          pushd ./plugin-validator/pkg/cmd/plugincheck2
+          go install
+          popd
+          plugincheck2 -config plugin-validator/config/private-plugin.yaml ${{ steps.metadata.outputs.archive }}
 
       - name: Create release
         id: create_release
@@ -158,8 +158,8 @@ jobs:
           asset_name: ${{ steps.metadata.outputs.archive-checksum }}
           asset_content_type: text/plain
 
-      # - name: Publish to Grafana.com
-      #   run: |
-      #     echo A draft release has been created for your plugin. Please review and publish it. Then submit your plugin to grafana.com/plugins by opening a PR to https://github.com/grafana/grafana-plugin-repository with the following entry:
-      #     echo
-      #     echo '{ "id": "${{ steps.metadata.outputs.plugin-id }}", "type": "${{ steps.metadata.outputs.plugin-type }}", "url": "https://github.com/${{ github.repository }}", "versions": [ { "version": "${{ steps.metadata.outputs.plugin-version }}", "commit": "${{ github.sha }}", "url": "https://github.com/${{ github.repository }}", "download": { "any": { "url": "https://github.com/${{ github.repository }}/releases/download/v${{ steps.metadata.outputs.plugin-version }}/${{ steps.metadata.outputs.archive }}", "md5": "${{ steps.package-plugin.outputs.checksum }}" } } } ] }' | jq .
+      - name: Publish to Grafana.com
+        run: |
+          echo A draft release has been created for your plugin. Please review and publish it. Then submit your plugin to grafana.com/plugins by opening a PR to https://github.com/grafana/grafana-plugin-repository with the following entry:
+          echo
+          echo '{ "id": "${{ steps.metadata.outputs.plugin-id }}", "type": "${{ steps.metadata.outputs.plugin-type }}", "url": "https://github.com/${{ github.repository }}", "versions": [ { "version": "${{ steps.metadata.outputs.plugin-version }}", "commit": "${{ github.sha }}", "url": "https://github.com/${{ github.repository }}", "download": { "any": { "url": "https://github.com/${{ github.repository }}/releases/download/v${{ steps.metadata.outputs.plugin-version }}/${{ steps.metadata.outputs.archive }}", "md5": "${{ steps.package-plugin.outputs.checksum }}" } } } ] }' | jq .

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.2.0
+- Migrate the plugin from Angular to React to increase compatibility with Grafana 7.x.
+
 ## 1.1.1
 - Handheld devices style improvement.
 

dashboards/demo.json

@@ -155,7 +155,7 @@
                     }
                 ],
                 "title": "Demo 1",
-                "type": "oc-icon-stat-panel"
+                "type": "oc-iconstat-panel"
             },
             {
                 "cacheTimeout": null,
@@ -261,7 +261,7 @@
                     }
                 ],
                 "title": "Demo 2",
-                "type": "oc-icon-stat-panel"
+                "type": "oc-iconstat-panel"
             },
             {
                 "cacheTimeout": null,
@@ -369,7 +369,7 @@
                     }
                 ],
                 "title": "Demo 3",
-                "type": "oc-icon-stat-panel"
+                "type": "oc-iconstat-panel"
             },
             {
                 "cacheTimeout": null,
@@ -476,7 +476,7 @@
                     }
                 ],
                 "title": "Demo 4",
-                "type": "oc-icon-stat-panel"
+                "type": "oc-iconstat-panel"
             }
         ],
         "refresh": "",

docker-compose.yml

@@ -6,7 +6,7 @@ services:
       - '3000:3000'
     volumes:
       - grafana-storage:/var/lib/grafana
-      - .:/var/lib/grafana/plugins/oc-icon-stat-panel/
+      - .:/var/lib/grafana/plugins/oc-iconstat-panel/
       - ./etc/grafana/grafana.ini:/etc/grafana/grafana.ini
     environment:
       - GF_SECURITY_ADMIN_USER=${GRAFANA_USERNAME}

etc/grafana/grafana.ini

@@ -873,7 +873,7 @@
 ;enable_alpha = false
 ;app_tls_skip_verify_insecure = false
 # Enter a comma-separated list of plugin identifiers to identify plugins to load even if they are unsigned. Plugins with modified signatures are never loaded.
-allow_loading_unsigned_plugins = crate-datasource, statistics-panel, oc-icon-stat-panel
+allow_loading_unsigned_plugins = oc-iconstat-panel
 # Enable or disable installing plugins directly from within Grafana.
 ;plugin_admin_enabled = false
 ;plugin_admin_external_manage_enabled = false

src/plugin.json

@@ -1,8 +1,8 @@
 {
   "$schema": "https://raw.githubusercontent.com/grafana/grafana/master/docs/sources/developers/plugins/plugin.schema.json",
   "type": "panel",
-  "name": "oc-icon-stat-panel",
-  "id": "orchestracities-icon-stat-panel",
+  "name": "Orchestra Cities Icon Stat Panel",
+  "id": "oc-iconstat-panel",
   "info": {
     "description": "",
     "author": {