Skip to content

Commit

Permalink
Merge pull request #19 from PrestaShop/dev
Browse files Browse the repository at this point in the history
Release 2.0.2
  • Loading branch information
Progi1984 authored Jan 11, 2022
2 parents b0a8ebd + bd262c8 commit ac5b640
Show file tree
Hide file tree
Showing 4 changed files with 99 additions and 4 deletions.
62 changes: 62 additions & 0 deletions .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
name: Build
on: [push, pull_request]

jobs:
deploy:
name: build dependencies & create artifact
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/[email protected]
- name: Install composer dependencies
run: composer install --no-dev -o
- name: Clean-up project
uses: PrestaShopCorp/[email protected]
- name: Prepare auto-index tool
run: |
composer global require prestashop/autoindex
- name: Generate index.php
run: |
~/.composer/vendor/bin/autoindex
- name: Create & upload artifact
uses: actions/upload-artifact@v1
with:
name: ${{ github.event.repository.name }}
path: ../
update_release_draft:
runs-on: ubuntu-latest
needs: [deploy]
if: github.event_name == 'push' && github.event.ref == 'refs/heads/master'
steps:
- name: Download artifact
uses: actions/download-artifact@v1
with:
name: ${{ github.event.repository.name }}
- id: release_info
uses: toolmantim/release-drafter@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Prepare for Release
run: |
cd ${{ github.event.repository.name }}
zip -r ${{ github.event.repository.name }}.zip ${{ github.event.repository.name }}
- name: Clean existing assets
shell: bash
run: |
curl -fsSL https://github.com/github/hub/raw/master/script/get | bash -s 2.14.1
assets=`bin/hub api -t repos/${{ github.repository }}/releases/${{ steps.release_info.outputs.id }}/assets | awk '/\].url/ { print $2 }'`
for asset in $assets
do
bin/hub api -X DELETE $asset
done
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Publish to GitHub Release
uses: actions/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.release_info.outputs.upload_url }}
asset_path: ./${{ github.event.repository.name }}/${{ github.event.repository.name }}.zip
asset_name: ${{ github.event.repository.name }}.zip
asset_content_type: application/zip
2 changes: 1 addition & 1 deletion config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<module>
<name>pagesnotfound</name>
<displayName><![CDATA[Pages not found]]></displayName>
<version><![CDATA[2.0.1]]></version>
<version><![CDATA[2.0.2]]></version>
<description><![CDATA[Displays the pages requested by your visitors that have not been found.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[analytics_stats]]></tab>
Expand Down
6 changes: 3 additions & 3 deletions pagesnotfound.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public function __construct()
{
$this->name = 'pagesnotfound';
$this->tab = 'analytics_stats';
$this->version = '2.0.1';
$this->version = '2.0.2';
$this->author = 'PrestaShop';
$this->need_instance = 0;

Expand All @@ -50,7 +50,7 @@ public function install()
{
if (!parent::install()
|| !$this->registerHook('displayTop')
|| !$this->registerHook('AdminStatsModules')
|| !$this->registerHook('displayAdminStatsModules')
) {
return false;
}
Expand Down Expand Up @@ -99,7 +99,7 @@ private function getPages()
return $pages;
}

public function hookAdminStatsModules()
public function hookDisplayAdminStatsModules()
{
if (Tools::isSubmit('submitTruncatePNF'))
{
Expand Down
33 changes: 33 additions & 0 deletions upgrade/upgrade-2.0.2.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@

<?php
/**
* Copyright since 2007 PrestaShop SA and Contributors
* PrestaShop is an International Registered Trademark & Property of PrestaShop SA
*
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License 3.0 (AFL-3.0)
* that is bundled with this package in the file LICENSE.md.
* It is also available through the world-wide-web at this URL:
* https://opensource.org/licenses/AFL-3.0
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* @author PrestaShop SA <[email protected]>
* @copyright Since 2007 PrestaShop SA and Contributors
* @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
*/

/**
* @param Module $module
*
* @return bool
*/
function upgrade_module_2_0_2($module)
{
$module->unregisterHook('AdminStatsModules');
$module->registerHook('displayAdminStatsModules');

return true;
}

0 comments on commit ac5b640

Please sign in to comment.