diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5f3bb64..0e2ba17 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,7 @@ jobs: release: runs-on: ubuntu-latest env: - GRAFANA_API_KEY: $\{{ secrets.GRAFANA_API_KEY }} # Requires a Grafana API key from Grafana.com. + GRAFANA_API_KEY: ${{ secrets.GRAFANA_API_KEY }} # Requires a Grafana API key from Grafana.com. steps: - uses: actions/checkout@v3 @@ -78,15 +78,15 @@ jobs: echo "path=release_notes.md" >> $GITHUB_OUTPUT - name: Check package version - run: if [ "v$\{{ steps.metadata.outputs.plugin-version }}" != "$\{{ steps.metadata.outputs.github-tag }}" ]; then printf "\033[0;31mPlugin version doesn't match tag name\033[0m\n"; exit 1; fi + run: if [ "v${{ steps.metadata.outputs.plugin-version }}" != "${{ steps.metadata.outputs.github-tag }}" ]; then printf "\033[0;31mPlugin version doesn't match tag name.\033[0m\n"; echo v${{ steps.metadata.outputs.plugin-version }} ${{ steps.metadata.outputs.github-tag }}; exit 1; fi - name: Package plugin id: package-plugin run: | - mv dist $\{{ steps.metadata.outputs.plugin-id }} - zip $\{{ steps.metadata.outputs.archive }} $\{{ steps.metadata.outputs.plugin-id }} -r - md5sum $\{{ steps.metadata.outputs.archive }} > $\{{ steps.metadata.outputs.archive-checksum }} - echo "checksum=$(cat ./$\{{ steps.metadata.outputs.archive-checksum }} | cut -d' ' -f1)" >> $GITHUB_OUTPUT + mv dist ${{ steps.metadata.outputs.plugin-id }} + zip ${{ steps.metadata.outputs.archive }} ${{ steps.metadata.outputs.plugin-id }} -r + md5sum ${{ steps.metadata.outputs.archive }} > ${{ steps.metadata.outputs.archive-checksum }} + echo "checksum=$(cat ./${{ steps.metadata.outputs.archive-checksum }} | cut -d' ' -f1)" >> $GITHUB_OUTPUT - name: Validate plugin run: | @@ -94,7 +94,7 @@ jobs: pushd ./plugin-validator/pkg/cmd/plugincheck2 go install popd - plugincheck2 -config ./plugin-validator/config/default.yaml $\{{ steps.metadata.outputs.archive }} + plugincheck2 -config ./plugin-validator/config/default.yaml ${{ steps.metadata.outputs.archive }} - name: Create Github release uses: softprops/action-gh-release@v1 @@ -102,21 +102,21 @@ jobs: draft: true generate_release_notes: true files: | - ./$\{{ steps.metadata.outputs.archive }} - ./$\{{ steps.metadata.outputs.archive-checksum }} + ./${{ steps.metadata.outputs.archive }} + ./${{ steps.metadata.outputs.archive-checksum }} body: | **This Github draft release has been created for your plugin.** - _Note: if this is the first release for your plugin please consult the [distributing-your-plugin section](https://github.com/$\{{github.repository}}/blob/main/README.md#distributing-your-plugin) of the README_ + _Note: if this is the first release for your plugin please consult the [distributing-your-plugin section](https://github.com/${{github.repository}}/blob/main/README.md#distributing-your-plugin) of the README_ If you would like to submit this release to Grafana please consider the following steps: - - Check the Validate plugin step in the [release workflow](https://github.com/$\{{github.repository}}/commit/$\{{github.sha}}/checks/$\{{github.run_id}}) for any warnings that need attention + - Check the Validate plugin step in the [release workflow](https://github.com/${{github.repository}}/commit/${{github.sha}}/checks/${{github.run_id}}) for any warnings that need attention - Navigate to https://grafana.com/auth/sign-in/ to sign into your account - Once logged in click **My Plugins** in the admin navigation - Click the **Submit Plugin** button - Fill in the Plugin Submission form: - - Paste this [.zip asset link](https://github.com/$\{{ github.repository }}/releases/download/v$\{{ steps.metadata.outputs.plugin-version }}/$\{{ steps.metadata.outputs.archive }}) in the Plugin URL field - - Paste this [.zip.md5 link](https://github.com/$\{{ github.repository }}/releases/download/v$\{{ steps.metadata.outputs.plugin-version }}/$\{{ steps.metadata.outputs.archive-checksum }}) in the MD5 field + - Paste this [.zip asset link](https://github.com/${{ github.repository }}/releases/download/v${{ steps.metadata.outputs.plugin-version }}/${{ steps.metadata.outputs.archive }}) in the Plugin URL field + - Paste this [.zip.md5 link](https://github.com/${{ github.repository }}/releases/download/v${{ steps.metadata.outputs.plugin-version }}/${{ steps.metadata.outputs.archive-checksum }}) in the MD5 field Once done please remove these instructions and publish this release. diff --git a/CHANGELOG.md b/CHANGELOG.md index bd005d2..f98e72f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ # Changelog -## v1.0.0 (2023-01-17) +## 1.0.0 (2023-01-17) Initial release. diff --git a/package.json b/package.json index d3348f7..4cdc94c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "googlecloud-logging-datasource", - "version": "v1.0.0", + "version": "1.0.0", "description": "Backend Grafana plugin that enables visualization of GCP Cloud Logging logs in Grafana.", "scripts": { "build": "grafana-toolkit plugin:build", diff --git a/src/plugin.json b/src/plugin.json index 11ad189..a62d1d7 100644 --- a/src/plugin.json +++ b/src/plugin.json @@ -32,7 +32,7 @@ } ], "screenshots": [], - "version": "0.0.0", + "version": "1.0.0", "updated": "%TODAY%" }, "dependencies": {