Skip to content

Commit

Permalink
Fix license, weird oddities (#62)
Browse files Browse the repository at this point in the history
* Fix release plugin to follow a normal workflow dispatch workflow

* Add tag

* Yaml formatting fix

* Fix naming of passed policy token

* Fix generic text in license file
  • Loading branch information
SandersAaronD authored Jul 10, 2024
1 parent 6732eb8 commit 40e035d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 3 deletions.
9 changes: 9 additions & 0 deletions .github/workflows/build-plugin/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,20 @@ runs:
shell: bash
working-directory: ${{ inputs.working-directory }}

- name: Create tag
run: |
git config user.name github-actions
git config user.email [email protected]
git tag -a v${{ steps.metadata.outputs.plugin-version }} -m "Release v${{ steps.metadata.outputs.plugin-version }}"
git push origin v${{ steps.metadata.outputs.plugin-version }}
shell: bash

- name: Create Github release
uses: softprops/action-gh-release@v2
with:
generate_release_notes: true
token: ${{ inputs.token }}
tag_name: v${{ steps.metadata.outputs.plugin-version }}
files: |
${{ inputs.working-directory }}/${{ steps.metadata.outputs.archive }}
${{ inputs.working-directory }}/${{ steps.metadata.outputs.archive-sha1sum }}
2 changes: 1 addition & 1 deletion .github/workflows/release-plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
id: build_plugin
uses: ./.github/workflows/build-plugin
with:
policy-token: ${{ secrets.GRAFANA_ACCESS_POLICY_TOKEN }}
policy_token: ${{ secrets.GRAFANA_ACCESS_POLICY_TOKEN }}
working-directory: grafana-aitraining-app

# This one is untested because the plugin is still way too alpha to publish.
Expand Down
4 changes: 2 additions & 2 deletions grafana-aitraining-app/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright {yyyy} {name of copyright owner}
Copyright 2024 Grafana Labs

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -198,4 +198,4 @@
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
limitations under the License.

0 comments on commit 40e035d

Please sign in to comment.