Skip to content

Commit

Permalink
Merge pull request #439 from XGProyect/development
Browse files Browse the repository at this point in the history
XGP 3.2
  • Loading branch information
LucasKovacs committed Nov 29, 2020
2 parents ac50199 + 74f47ad commit 5d02f9e
Show file tree
Hide file tree
Showing 1,157 changed files with 6,104 additions and 5,934 deletions.
42 changes: 42 additions & 0 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: PHP Tests

on:
push:
branches: [ test-ci, xgp-3.2 ]
pull_request:

jobs:
test:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2

- name: Validate composer.json and composer.lock
run: composer validate

- name: Install dependencies
run: composer install --prefer-dist --no-progress --no-suggest

# Not fully working at the moment, ignore errors
- name: Run phpunit
run: composer test
continue-on-error: true

- name: Run phplint
uses: overtrue/phplint@2.1.0
with:
path: src/upload/
options: --exclude=*.log
min-version:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2

- name: Validate composer.json and composer.lock
run: composer validate

- name: Install dependencies
run: composer install --prefer-dist --no-progress --no-suggest

- name: Run phpcompatinfo
run: composer run-script phpcompatinfo
11 changes: 9 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,18 @@
# application
#
src/upload/application/config/config.php
src/upload/application/logs/*.txt

#
# writable
#
src/upload/writable/backups/*.sql
src/upload/writable/cache/*.html
/src/upload/writable/logs/*.txt

#
# tests
#
src/upload/tests/.phpunit.result.cache
src/upload/tests/build/
src/upload/tests/_reports/

Expand All @@ -30,4 +37,4 @@ nbproject/
# composer
#
vendor
composer.lock
composer.lock
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Point you browser to your localhost and follow the step by step instructions pro
### Composer

```
composer create-project xgproyect/xgproyect xgp v3.1.0rc
composer create-project xgproyect/xgproyect xgp v3.2.0
```

## Who is using XG Proyect?
Expand Down
2 changes: 1 addition & 1 deletion phpdoc.dist.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<phpdocumentor>
<title><![CDATA[XGP Proyect v3.1.0]]></title>
<title><![CDATA[XGP Proyect v3.2.0]]></title>
<encoding>utf-8</encoding>
<parser>
<target>docs</target>
Expand Down
File renamed without changes.

0 comments on commit 5d02f9e

Please sign in to comment.