Skip to content

Commit

Permalink
Merge pull request #1 from fusioninventory/gsit9.5+rename_plugin_GSIT
Browse files Browse the repository at this point in the history
Modify GLPI references to GSIT
  • Loading branch information
ddurieux authored Feb 12, 2023
2 parents d07b2e6 + bc2e151 commit cf4136a
Show file tree
Hide file tree
Showing 318 changed files with 639 additions and 703 deletions.
110 changes: 23 additions & 87 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,21 +50,21 @@ jobs:
- name: Lint
run: php vendor/bin/robo --no-interaction code:cs

phpunit-GLPI-latest:
phpunit-GSIT-latest:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
php-versions: ['7.3', '7.4', '8.0']
glpi-versions: ['9.5.7']
name: phpunit-GLPI-latest (${{ matrix.glpi-versions }}) | PHP(${{ matrix.php-versions }})
gsit-versions: ['9.5.10']
name: phpunit-GSIT-latest (${{ matrix.gsit-versions }}) | PHP(${{ matrix.php-versions }})
env:
extensions: zip, hash, fileinfo, mysqli, gd, bz2, xdebug
key: cache-v1
steps:
- uses: ankane/setup-mariadb@v1
with:
mariadb-version: 10.5
mariadb-version: 10.8
- uses: actions/checkout@v1
- name: Setup cache environment
id: extcache
Expand Down Expand Up @@ -95,104 +95,40 @@ jobs:
- uses: php-actions/composer@v6
with:
php_version: ${{ matrix.php-versions }}
- name: Get GLPI
run: wget https://github.com/glpi-project/glpi/releases/download/${{ matrix.glpi-versions }}/glpi-${{ matrix.glpi-versions }}.tgz
- name: Uncompress GLPI
run: tar zxvf glpi-${{ matrix.glpi-versions }}.tgz
- name: Get GSIT
run: wget https://github.com/DCS-Easyware/gsit/releases/download/GSIT-${{ matrix.gsit-versions }}/gsit-${{ matrix.gsit-versions }}.tgz
- name: Uncompress GSIT
run: tar zxvf gsit-${{ matrix.gsit-versions }}.tgz
- name: Copy Plugin FusionInventory
run: rsync -avr --exclude='glpi' ./* glpi/plugins/fusioninventory/
run: rsync -avr --exclude='gsit' ./* gsit/plugins/fusioninventory/
- name: Create the database
run: mysqladmin create glpi
run: mysqladmin create gsit
- name: Check php dependencies
run: cd glpi && php bin/console glpi:system:check_requirements
- name: Install GLPI
run: cd glpi && mkdir tests && php bin/console glpi:database:install -n --config-dir=tests --db-name=glpi --db-user=root
run: cd gsit && php bin/console glpi:system:check_requirements
- name: Install GSIT
run: cd gsit && mkdir tests && php bin/console glpi:database:install -n --config-dir=tests --db-name=glpi --db-user=root
- name: Install plugin FusionInventory
run: cd glpi && php bin/console glpi:plugin:install -vvv -n --config-dir=tests --username=glpi fusioninventory
run: cd gsit && php bin/console glpi:plugin:install -vvv -n --config-dir=tests --username=glpi fusioninventory
- name: Activate plugin FusionInventory
run: cd glpi && php bin/console glpi:plugin:activate -n --config-dir=tests fusioninventory
run: cd gsit && php bin/console glpi:plugin:activate -n --config-dir=tests fusioninventory
- name: run tests
run: cd glpi/plugins/fusioninventory/ && php vendor/bin/phpunit --testdox tests/
run: cd gsit/plugins/fusioninventory/ && php vendor/bin/phpunit --testdox tests/

phpunit-GLPI-previous:
phpunit-GSIT-previous:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
php-versions: ['7.4']
glpi-versions: ['9.5.3','9.5.4','9.5.5','9.5.6']
name: phpunit-GLPI-latest (${{ matrix.glpi-versions }}) | PHP(${{ matrix.php-versions }})
env:
extensions: zip, hash, fileinfo, mysqli, gd, bz2, xdebug
key: cache-v1
steps:
- uses: ankane/setup-mariadb@v1
with:
mariadb-version: 10.5
- uses: actions/checkout@v1
- name: Setup cache environment
id: extcache
uses: shivammathur/cache-extensions@v1
with:
php-version: ${{ matrix.php-versions }}
extensions: ${{ env.extensions }}
key: ${{ env.key }}

- name: Cache extensions
uses: actions/cache@v2
with:
path: ${{ steps.extcache.outputs.dir }}
key: ${{ steps.extcache.outputs.key }}
restore-keys: ${{ steps.extcache.outputs.key }}

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-versions }}
extensions: ${{ env.extensions }}

- name: Cache Composer dependencies
uses: actions/cache@v2
with:
path: /tmp/composer-cache
key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}
- uses: php-actions/composer@v6
with:
php_version: ${{ matrix.php-versions }}
- name: Get GLPI
run: wget https://github.com/glpi-project/glpi/releases/download/${{ matrix.glpi-versions }}/glpi-${{ matrix.glpi-versions }}.tgz
- name: Uncompress GLPI
run: tar zxvf glpi-${{ matrix.glpi-versions }}.tgz
- name: Copy Plugin FusionInventory
run: rsync -avr --exclude='glpi' ./* glpi/plugins/fusioninventory/
- name: Create the database
run: mysqladmin create glpi
- name: Check php dependencies
run: cd glpi && php bin/console glpi:system:check_requirements
- name: Install GLPI
run: cd glpi && mkdir tests && php bin/console glpi:database:install -n --config-dir=tests --db-name=glpi --db-user=root
- name: Install plugin FusionInventory
run: cd glpi && php bin/console glpi:plugin:install -vvv -n --config-dir=tests --username=glpi fusioninventory
- name: Activate plugin FusionInventory
run: cd glpi && php bin/console glpi:plugin:activate -n --config-dir=tests fusioninventory
- name: run tests
run: cd glpi/plugins/fusioninventory/ && php vendor/bin/phpunit --testdox tests/

phpunit-GSIT:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
php-versions: ['7.3', '7.4', '8.0']
gsit-versions: ['9.5.7']
name: phpunit-GSIT (${{ matrix.gsit-versions }}) | PHP(${{ matrix.php-versions }})
gsit-versions: ['9.5.8','9.5.9']
name: phpunit-GSIT-latest (${{ matrix.gsit-versions }}) | PHP(${{ matrix.php-versions }})
env:
extensions: zip, hash, fileinfo, mysqli, gd, bz2, xdebug
key: cache-v1
steps:
- uses: ankane/setup-mariadb@v1
with:
mariadb-version: 10.5
mariadb-version: 10.8
- uses: actions/checkout@v1
- name: Setup cache environment
id: extcache
Expand Down Expand Up @@ -224,17 +160,17 @@ jobs:
with:
php_version: ${{ matrix.php-versions }}
- name: Get GSIT
run: wget https://github.com/DCS-Easyware/gsit/releases/download/GSIT-${{ matrix.gsit-versions }}/gsit-${{ matrix.gsit-versions }}.tar.gz
run: wget https://github.com/DCS-Easyware/gsit/releases/download/GSIT-${{ matrix.gsit-versions }}/gsit-${{ matrix.gsit-versions }}.tgz
- name: Uncompress GSIT
run: tar zxvf gsit-${{ matrix.gsit-versions }}.tar.gz
run: tar zxvf gsit-${{ matrix.gsit-versions }}.tgz
- name: Copy Plugin FusionInventory
run: rsync -avr --exclude='gsit' ./* gsit/plugins/fusioninventory/
- name: Create the database
run: mysqladmin create gsit
- name: Check php dependencies
run: cd gsit && php bin/console glpi:system:check_requirements
- name: Install GSIT
run: cd gsit && mkdir tests && php bin/console glpi:database:install -n --config-dir=tests --db-name=gsit --db-user=root
run: cd gsit && mkdir tests && php bin/console glpi:database:install -n --config-dir=tests --db-name=glpi --db-user=root
- name: Install plugin FusionInventory
run: cd gsit && php bin/console glpi:plugin:install -vvv -n --config-dir=tests --username=glpi fusioninventory
- name: Activate plugin FusionInventory
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
## Fusioninventory Plugin
[![Build Status](https://travis-ci.org/fusioninventory/fusioninventory-for-glpi.svg?branch=master)](https://travis-ci.org/fusioninventory/fusioninventory-for-glpi)
[![Coverage Status](https://coveralls.io/repos/fusioninventory/fusioninventory-for-glpi/badge.svg)](https://coveralls.io/r/fusioninventory/fusioninventory-for-glpi)
(![GitHub downloads](https://img.shields.io/github/downloads/fusioninventory/fusioninventory-for-glpi/total.svg) + ![Redmine downloads](https://img.shields.io/badge/downloads%20redmine-218k%20total-brightgreen.svg))
## Fusioninventory Plugin for GSIT
[![Build Status](https://github.com/fusioninventory/fusioninventory-for-gsit/actions/workflows/tests.yml/badge.svg)](https://github.com/fusioninventory/fusioninventory-for-glpi/actions)
[![Coverage Status](https://coveralls.io/repos/fusioninventory/fusioninventory-for-gsit/badge.svg)](https://coveralls.io/r/fusioninventory/fusioninventory-for-gsit)
(![GitHub downloads](https://img.shields.io/github/downloads/fusioninventory/fusioninventory-for-gsit/total.svg))

This plugin makes GLPI to process various types of tasks for Fusioninventory agents:
This plugin makes GSIT to process various types of tasks for Fusioninventory agents:
* Computer inventory
* Network discovery
* Network (SNMP) inventory
Expand Down Expand Up @@ -36,4 +36,4 @@ Some icons used in the project comes from the following set of graphics licensed

* [Official website](http://fusioninventory.org/)
* [Translations on transifex service](https://www.transifex.com/ddurieux/FusionInventory/content/)
* [Issues](https://github.com/fusioninventory/fusioninventory-for-glpi)
* [Issues](https://github.com/fusioninventory/fusioninventory-for-gsit)
4 changes: 2 additions & 2 deletions README.tests.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# How to run tests


## Install GLPI tests
## Install GSIT tests

```
cd glpi/
cd gsit/
php bin/console glpi:database:install --config-dir=tests --force
php bin/console glpi:plugin:install --config-dir=tests --username=glpi fusioninventory
php bin/console glpi:plugin:activate --config-dir=tests fusioninventory
Expand Down
2 changes: 1 addition & 1 deletion ajax/cancel_job.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
@license AGPL License 3.0 or (at your option) any later version
http://www.gnu.org/licenses/agpl-3.0-standalone.html
@link http://www.fusioninventory.org/
@link http://forge.fusioninventory.org/projects/fusioninventory-for-glpi/
@link https://github.com/fusioninventory/fusioninventory-for-gsit
@since 2010
------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions ajax/deploy_displaytypevalue.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Copyright (C) 2010-2022 by the FusionInventory Development Team.
*
* http://www.fusioninventory.org/
* https://github.com/fusioninventory/fusioninventory-for-glpi
* https://github.com/fusioninventory/fusioninventory-for-gsit
* http://forge.fusioninventory.org/
*
* ------------------------------------------------------------------------
Expand Down Expand Up @@ -40,7 +40,7 @@
* @license AGPL License 3.0 or (at your option) any later version
* http://www.gnu.org/licenses/agpl-3.0-standalone.html
* @link http://www.fusioninventory.org/
* @link https://github.com/fusioninventory/fusioninventory-for-glpi
* @link https://github.com/fusioninventory/fusioninventory-for-gsit
*
*/

Expand Down
4 changes: 2 additions & 2 deletions ajax/deployfilemodal.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Copyright (C) 2010-2022 by the FusionInventory Development Team.
*
* http://www.fusioninventory.org/
* https://github.com/fusioninventory/fusioninventory-for-glpi
* https://github.com/fusioninventory/fusioninventory-for-gsit
* http://forge.fusioninventory.org/
*
* ------------------------------------------------------------------------
Expand Down Expand Up @@ -42,7 +42,7 @@
* @license AGPL License 3.0 or (at your option) any later version
* http://www.gnu.org/licenses/agpl-3.0-standalone.html
* @link http://www.fusioninventory.org/
* @link https://github.com/fusioninventory/fusioninventory-for-glpi
* @link https://github.com/fusioninventory/fusioninventory-for-gsit
*
*/

Expand Down
4 changes: 2 additions & 2 deletions ajax/deploypackage_form.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Copyright (C) 2010-2022 by the FusionInventory Development Team.
*
* http://www.fusioninventory.org/
* https://github.com/fusioninventory/fusioninventory-for-glpi
* https://github.com/fusioninventory/fusioninventory-for-gsit
* http://forge.fusioninventory.org/
*
* ------------------------------------------------------------------------
Expand Down Expand Up @@ -40,7 +40,7 @@
* @license AGPL License 3.0 or (at your option) any later version
* http://www.gnu.org/licenses/agpl-3.0-standalone.html
* @link http://www.fusioninventory.org/
* @link https://github.com/fusioninventory/fusioninventory-for-glpi
* @link https://github.com/fusioninventory/fusioninventory-for-gsit
*
*/

Expand Down
4 changes: 2 additions & 2 deletions ajax/deployuser.logged.in.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Copyright (C) 2010-2022 by the FusionInventory Development Team.
*
* http://www.fusioninventory.org/
* https://github.com/fusioninventory/fusioninventory-for-glpi
* https://github.com/fusioninventory/fusioninventory-for-gsit
* http://forge.fusioninventory.org/
*
* ------------------------------------------------------------------------
Expand Down Expand Up @@ -41,7 +41,7 @@
* @license AGPL License 3.0 or (at your option) any later version
* http://www.gnu.org/licenses/agpl-3.0-standalone.html
* @link http://www.fusioninventory.org/
* @link https://github.com/fusioninventory/fusioninventory-for-glpi
* @link https://github.com/fusioninventory/fusioninventory-for-gsit
*
*/

Expand Down
4 changes: 2 additions & 2 deletions ajax/dropdownCredentials.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Copyright (C) 2010-2022 by the FusionInventory Development Team.
*
* http://www.fusioninventory.org/
* https://github.com/fusioninventory/fusioninventory-for-glpi
* https://github.com/fusioninventory/fusioninventory-for-gsit
* http://forge.fusioninventory.org/
*
* ------------------------------------------------------------------------
Expand Down Expand Up @@ -42,7 +42,7 @@
* @license AGPL License 3.0 or (at your option) any later version
* http://www.gnu.org/licenses/agpl-3.0-standalone.html
* @link http://www.fusioninventory.org/
* @link https://github.com/fusioninventory/fusioninventory-for-glpi
* @link https://github.com/fusioninventory/fusioninventory-for-gsit
*
*/

Expand Down
4 changes: 2 additions & 2 deletions ajax/dropdown_taskjob.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Copyright (C) 2010-2022 by the FusionInventory Development Team.
*
* http://www.fusioninventory.org/
* https://github.com/fusioninventory/fusioninventory-for-glpi
* https://github.com/fusioninventory/fusioninventory-for-gsit
* http://forge.fusioninventory.org/
*
* ------------------------------------------------------------------------
Expand Down Expand Up @@ -40,7 +40,7 @@
* @license AGPL License 3.0 or (at your option) any later version
* http://www.gnu.org/licenses/agpl-3.0-standalone.html
* @link http://www.fusioninventory.org/
* @link https://github.com/fusioninventory/fusioninventory-for-glpi
* @link https://github.com/fusioninventory/fusioninventory-for-gsit
*
*/

Expand Down
4 changes: 2 additions & 2 deletions ajax/dropdownactionlist.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Copyright (C) 2010-2022 by the FusionInventory Development Team.
*
* http://www.fusioninventory.org/
* https://github.com/fusioninventory/fusioninventory-for-glpi
* https://github.com/fusioninventory/fusioninventory-for-gsit
* http://forge.fusioninventory.org/
*
* ------------------------------------------------------------------------
Expand Down Expand Up @@ -42,7 +42,7 @@
* @license AGPL License 3.0 or (at your option) any later version
* http://www.gnu.org/licenses/agpl-3.0-standalone.html
* @link http://www.fusioninventory.org/
* @link https://github.com/fusioninventory/fusioninventory-for-glpi
* @link https://github.com/fusioninventory/fusioninventory-for-gsit
*
*/

Expand Down
4 changes: 2 additions & 2 deletions ajax/dropdownactionselection.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Copyright (C) 2010-2022 by the FusionInventory Development Team.
*
* http://www.fusioninventory.org/
* https://github.com/fusioninventory/fusioninventory-for-glpi
* https://github.com/fusioninventory/fusioninventory-for-gsit
* http://forge.fusioninventory.org/
*
* ------------------------------------------------------------------------
Expand Down Expand Up @@ -41,7 +41,7 @@
* @license AGPL License 3.0 or (at your option) any later version
* http://www.gnu.org/licenses/agpl-3.0-standalone.html
* @link http://www.fusioninventory.org/
* @link https://github.com/fusioninventory/fusioninventory-for-glpi
* @link https://github.com/fusioninventory/fusioninventory-for-gsit
*
*/

Expand Down
4 changes: 2 additions & 2 deletions ajax/dropdownactiontype.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Copyright (C) 2010-2022 by the FusionInventory Development Team.
*
* http://www.fusioninventory.org/
* https://github.com/fusioninventory/fusioninventory-for-glpi
* https://github.com/fusioninventory/fusioninventory-for-gsit
* http://forge.fusioninventory.org/
*
* ------------------------------------------------------------------------
Expand Down Expand Up @@ -40,7 +40,7 @@
* @license AGPL License 3.0 or (at your option) any later version
* http://www.gnu.org/licenses/agpl-3.0-standalone.html
* @link http://www.fusioninventory.org/
* @link https://github.com/fusioninventory/fusioninventory-for-glpi
* @link https://github.com/fusioninventory/fusioninventory-for-gsit
*
*/

Expand Down
4 changes: 2 additions & 2 deletions ajax/dropdowndefinitionlist.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Copyright (C) 2010-2022 by the FusionInventory Development Team.
*
* http://www.fusioninventory.org/
* https://github.com/fusioninventory/fusioninventory-for-glpi
* https://github.com/fusioninventory/fusioninventory-for-gsit
* http://forge.fusioninventory.org/
*
* ------------------------------------------------------------------------
Expand Down Expand Up @@ -41,7 +41,7 @@
* @license AGPL License 3.0 or (at your option) any later version
* http://www.gnu.org/licenses/agpl-3.0-standalone.html
* @link http://www.fusioninventory.org/
* @link https://github.com/fusioninventory/fusioninventory-for-glpi
* @link https://github.com/fusioninventory/fusioninventory-for-gsit
*
*/

Expand Down
Loading

0 comments on commit cf4136a

Please sign in to comment.