Skip to content

Commit

Permalink
Merge branch 'release/1.7.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
cedric-anne committed Mar 9, 2021
2 parents 9e206cc + a63dd3f commit 3be79ca
Show file tree
Hide file tree
Showing 447 changed files with 592 additions and 51,766 deletions.
40 changes: 40 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: "Plugin release"

on:
push:
tags:
- '*'

jobs:
create-release:
name: "Create release"
runs-on: "ubuntu-latest"
steps:
- name: "Extract tag name"
run: |
echo "tag_name=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
- name: "Checkout"
uses: "actions/checkout@v2"
- name: "Build package"
id: "build-package"
uses: "glpi-project/tools/github-actions/[email protected]"
with:
plugin-version: ${{ env.tag_name }}
- name: "Create release"
id: "create-release"
uses: "actions/create-release@v1"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ env.tag_name }}
release_name: ${{ env.tag_name }}
draft: true
- name: "Attach package to release"
uses: "actions/upload-release-asset@v1"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create-release.outputs.upload_url }}
asset_path: ${{ steps.build-package.outputs.package-path }}
asset_name: ${{ steps.build-package.outputs.package-basename }}
asset_content_type: " application/x-bzip2"
3 changes: 1 addition & 2 deletions ajax/dashboard.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@
//load protovis lib for dashboard render
$version = Plugin::getInfo('mreporting', 'version');
$php_dir = Plugin::getPhpDir('mreporting', false);
echo Html::script($php_dir . "/lib/protovis/protovis.min.js", ['version' => $version]);
echo Html::script($php_dir . "/lib/protovis-msie/protovis-msie.min.js", ['version' => $version]);
echo Html::script($php_dir . "/lib/protovis/protovis.js", ['version' => $version]);

Html::popFooter();
break;
Expand Down
Loading

0 comments on commit 3be79ca

Please sign in to comment.