Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build script fixes #12

Merged
merged 1 commit into from
Jan 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,3 @@ tests/ export-ignore
.gitignore export-ignore
.gitattributes export-ignore
phpunit.xml.* export-ignore
composer.lock export-ignore
composer.phar export-ignore
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ name: Tests
env:
EXTNAME: phpbb/webpushnotifications # Your extension vendor/package name
SNIFF: 1 # Run code sniffer on your code? 1 or 0
IMAGE_ICC: 1 # Run icc profile sniffer on your images? 1 or 0
IMAGE_ICC: 0 # Run icc profile sniffer on your images? 1 or 0 (we are not using any images)
EPV: 1 # Run EPV (Extension Pre Validator) on your code? 1 or 0
EXECUTABLE_FILES: 1 # Run check for executable files? 1 or 0
EXECUTABLE_FILES: 0 # Run check for executable files? 1 or 0 (disabled to allow composer.phar)
PHPBB_BRANCH: 3.3.x # The phpBB branch to run tests on

on:
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/build/
/vendor/
/node_modules/
/composer.phar
2 changes: 1 addition & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<if>
<equals arg1="${has-dependencies}" arg2="1" />
<then>
<exec dir="${package-directory}" command="php ../../../../../../../../composer.phar install --no-dev --no-plugins"
<exec dir="${package-directory}" command="php composer.phar install --no-dev"
checkreturn="true" />
</then>
</if>
Expand Down
7 changes: 6 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,12 @@
"require-dev": {
"phing/phing": "2.4.*"
},
"extra": {
"config": {
"allow-plugins": {
"composer/installers": true
}
},
"extra": {
"display-name": "phpBB Browser Push Notifications",
"soft-require": {
"phpbb/phpbb": ">=3.3.12,<4.0.0@dev"
Expand Down
Binary file added composer.phar
Binary file not shown.