Skip to content

Commit

Permalink
Moved tools to additional composer.json file (#83)
Browse files Browse the repository at this point in the history
* Updated dependencies

* Moved tools from phive to additional composer script

* Restored tests at php 8.0
  • Loading branch information
norberttech authored Apr 24, 2021
1 parent 4e3f028 commit 045ac27
Show file tree
Hide file tree
Showing 12 changed files with 5,454 additions and 136 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*.phpt text eol=lf
/composer.lock export-ignore
/.github/ export-ignore
/.phive/ export-ignore
/tools/ export-ignore
/docs export-ignore
/tests export-ignore
/.gitattributes export-ignore
Expand Down
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@ updates:
directory: "/"
schedule:
interval: "daily"
- package-ecosystem: "composer"
directory: "/tools"
schedule:
interval: "daily"
5 changes: 1 addition & 4 deletions .github/workflows/static-analyze.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
uses: "shivammathur/setup-php@v2"
with:
coverage: pcov
tools: phive, composer:v2
tools: composer:v2
php-version: "${{ matrix.php-version }}"
ini-values: memory_limit=-1

Expand Down Expand Up @@ -61,8 +61,5 @@ jobs:
- name: "Install locked dependencies"
run: "composer install --no-interaction --no-progress --no-suggest"

- name: "Install tools"
run: "phive install --trust-gpg-keys E82B2FB314E9906E,C5095986493B4AA0,CF1A108D0E7AE720,8A03EA3B385DBAA1,D0254321FB74703A,4AA394086372C20A --force-accept-unsigned"

- name: "Static Analyze"
run: "composer static:analyze"
7 changes: 2 additions & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- "highest"
php-version:
- "7.4"
#- "8.0"
- "8.0"
operating-system:
- "ubuntu-latest"

Expand All @@ -34,7 +34,7 @@ jobs:
uses: "shivammathur/setup-php@v2"
with:
coverage: pcov
tools: phive, composer:v2
tools: composer:v2
php-version: "${{ matrix.php-version }}"
ini-values: memory_limit=-1

Expand Down Expand Up @@ -74,8 +74,5 @@ jobs:
if: ${{ matrix.dependencies == 'locked' }}
run: "composer install --no-interaction --no-progress --no-suggest"

- name: "Install tools"
run: "phive install --trust-gpg-keys E82B2FB314E9906E,4AA394086372C20A --force-accept-unsigned"

- name: "Test"
run: "composer test"
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
vendor
build
tools
*.cache
var
automation.xml
6 changes: 0 additions & 6 deletions .phive/phars.xml

This file was deleted.

14 changes: 11 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "aeon-php/automation",
"description": "Automatically update project changelog after commit/tag/release/pull request in \"keep a changelog\" format (or not)",
"authors": [
{
"name": "Norbert Orzechowicz",
Expand Down Expand Up @@ -50,11 +51,18 @@
"@static:analyze"
],
"test": [
"tools/phpunit.phar"
"tools/vendor/bin/phpunit"
],
"static:analyze": [
"tools/php-cs-fixer fix --dry-run"
"tools/vendor/bin/php-cs-fixer fix --dry-run"
],
"cs:php:fix": "tools/php-cs-fixer fix"
"cs:php:fix": "tools/vendor/bin/php-cs-fixer fix",
"tools:install": "composer install --working-dir=./tools",
"post-install-cmd": [
"@tools:install"
],
"post-update-cmd": [
"@tools:install"
]
}
}
Loading

0 comments on commit 045ac27

Please sign in to comment.