@grafana/create-plugin 4.10.6-canary.924.74dcfb0.0 → 4.10.6

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+# v4.10.6 (Mon May 27 2024)
+
+#### 🐛 Bug Fix
+
+- Create plugin: CI workflow improvements [#890](https://github.com/grafana/plugin-tools/pull/890) ([@sunker](https://github.com/sunker))
+
+#### Authors: 1
+
+- Erik Sundell ([@sunker](https://github.com/sunker))
+
+---
+
 # v4.10.5 (Fri May 24 2024)
 
 #### 🐛 Bug Fix

package/dist/utils/utils.templates.js

@@ -117,7 +117,6 @@ export function getTemplateData(cliArgs) {
             useCypress,
             hasGithubWorkflows: isFile(path.join(githubFolder, 'ci.yml')),
             hasGithubLevitateWorkflow: isFile(path.join(githubFolder, 'is-compatible.yml')),
-            pluginExecutable: pluginJson.executable,
         };
     }
     debug('\nTemplate data:\n' + JSON.stringify(templateData, null, 2));

package/fixtures/test-template/src/plugin.json

@@ -4,7 +4,7 @@
   "name": "{{ titleCase pluginName }}",
   "id": "{{ pluginId }}",
   "backend": true,
-  "executable": "{{#if pluginExecutable}}{{pluginExecutable}}{{else}}gpx_{{ snakeCase pluginName }}{{/if}}",
+  "executable": "gpx_{{ snakeCase pluginName }}",
   "info": {
     "description": "{{ sentenceCase pluginDescription }}",
     "author": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/create-plugin",
-  "version": "4.10.6-canary.924.74dcfb0.0",
+  "version": "4.10.6",
   "repository": {
     "directory": "packages/create-plugin",
     "url": "https://github.com/grafana/plugin-tools"
@@ -87,5 +87,5 @@
   "engines": {
     "node": ">=20"
   },
-  "gitHead": "74dcfb0d279d0a0e1d5f09b4b631a699c1a0f312"
+  "gitHead": "a62657e3e49f532ac5944578f534d02eecbbc400"
 }

package/src/types.ts

@@ -32,5 +32,4 @@ export type TemplateData = {
   useCypress: boolean;
   hasGithubWorkflows: boolean;
   hasGithubLevitateWorkflow: boolean;
-  pluginExecutable?: string;
 };

package/src/utils/utils.templates.ts

@@ -164,7 +164,6 @@ export function getTemplateData(cliArgs?: GenerateCliArgs): TemplateData {
       useCypress,
       hasGithubWorkflows: isFile(path.join(githubFolder, 'ci.yml')),
       hasGithubLevitateWorkflow: isFile(path.join(githubFolder, 'is-compatible.yml')),
-      pluginExecutable: pluginJson.executable,
     };
   }
 

package/templates/app/src/plugin.json

@@ -4,7 +4,7 @@
   "name": "{{ titleCase pluginName }}",
   "id": "{{ pluginId }}",{{#if hasBackend}}
   "backend": true,
-  "executable": "{{#if pluginExecutable}}{{pluginExecutable}}{{else}}gpx_{{ snakeCase pluginName }}{{/if}}",{{/if}}
+  "executable": "gpx_{{ snakeCase pluginName }}",{{/if}}
   "info": {
     "keywords": ["app"],
     "description": "{{ sentenceCase pluginDescription }}",

package/templates/common/.config/supervisord/supervisord.conf

@@ -6,7 +6,7 @@ user=root
 user=root
 directory=/var/lib/grafana
 {{#if hasBackend}}
-command=bash -c 'while [ ! -f /root/{{ pluginId }}/dist/{{#if pluginExecutable}}{{pluginExecutable}}{{else}}gpx_{{ snakeCase pluginName }}{{/if}}* ]; do sleep 1; done; /run.sh'
+command=bash -c 'while [ ! -f /root/{{ pluginId }}/dist/gpx_{{ snakeCase pluginName }}* ]; do sleep 1; done; /run.sh'
 {{else}}
 command=/run.sh
 {{/if}}
@@ -20,7 +20,7 @@ autostart=true
 {{#if hasBackend}}
 [program:delve]
 user=root
-command=/bin/bash -c 'pid=""; while [ -z "$pid" ]; do pid=$(pgrep -f {{#if pluginExecutable}}{{pluginExecutable}}{{else}}gpx_{{ snakeCase pluginName }}{{/if}}); done; /root/go/bin/dlv attach --api-version=2 --headless --continue --accept-multiclient --listen=:2345 $pid'
+command=/bin/bash -c 'pid=""; while [ -z "$pid" ]; do pid=$(pgrep -f gpx_{{ snakeCase pluginName }}); done; /root/go/bin/dlv attach --api-version=2 --headless --continue --accept-multiclient --listen=:2345 $pid'
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 redirect_stderr=true

package/templates/datasource/src/plugin.json

@@ -5,7 +5,7 @@
   "id": "{{ pluginId }}",
   "metrics": true,{{#if hasBackend}}
   "backend": true,
-  "executable": "{{#if pluginExecutable}}{{pluginExecutable}}{{else}}gpx_{{ snakeCase pluginName }}{{/if}}",{{/if}}
+  "executable": "gpx_{{ snakeCase pluginName }}",{{/if}}
   "info": {
     "description": "{{ sentenceCase pluginDescription }}",
     "author": {

package/templates/github/ci/.github/workflows/ci.yml

@@ -141,11 +141,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          sparse-checkout: |
-            provisioning
-            tests
-            .config
 
       - name: Download plugin
         if: needs.build.outputs.has-backend == 'true'
@@ -187,7 +182,7 @@ jobs:
           interval: 500
 
       - name: Install Playwright Browsers
-        run: npx playwright install chromium --with-deps
+        run: {{ packageManagerName }} exec playwright install chromium --with-deps
 
       - name: Run Playwright tests
         id: run-tests
@@ -208,13 +203,13 @@ jobs:
           name: $\{{ matrix.GRAFANA_IMAGE.NAME }}-v$\{{ matrix.GRAFANA_IMAGE.VERSION }}-$\{{github.run_id}}-server-log
           path: grafana-server.log
           retention-days: 5
-
-      # If your repository is public, uploading the Playwright report will make it public on the Internet.
-      # Beware not to expose sensitive information.
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        if: $\{{ always() && steps.run-tests.outcome == 'failure' }}
-        with:
-          name: playwright-report-$\{{ matrix.GRAFANA_IMAGE.NAME }}-v$\{{ matrix.GRAFANA_IMAGE.VERSION }}-$\{{github.run_id}}
-          path: playwright-report/
-          retention-days: 5
+  
+      # Uncomment this step to upload the Playwright report to Github artifacts.
+      # If your repository is public, the report will be public on the Internet so beware not to expose sensitive information.
+      # - name: Upload artifacts
+      #   uses: actions/upload-artifact@v4
+      #   if: $\{{ always() && steps.run-tests.outcome == 'failure' }}
+      #   with:
+      #     name: playwright-report-$\{{ matrix.GRAFANA_IMAGE.NAME }}-v$\{{ matrix.GRAFANA_IMAGE.VERSION }}-$\{{github.run_id}}
+      #     path: playwright-report/
+      #     retention-days: 5

package/templates/scenes-app/src/plugin.json

@@ -4,7 +4,7 @@
   "name": "{{ titleCase pluginName }}",
   "id": "{{ pluginId }}",{{#if hasBackend}}
   "backend": true,
-  "executable": "{{#if pluginExecutable}}{{pluginExecutable}}{{else}}gpx_{{ snakeCase pluginName }}{{/if}}",{{/if}}
+  "executable": "gpx_{{ snakeCase pluginName }}",{{/if}}
   "info": {
     "keywords": [
       "app"