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.

Sign up for GitHub

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

Composer2 fix #1120

Closed
wants to merge 5 commits into from
Closed

Composer2 fix #1120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f8b2a8f
4.4.4 Release
lcharette Nov 20, 2020
9a0c8e2
Update CHANGELOG.md
lcharette Nov 20, 2020
32bf350
Testing composer-merge-plugin fix
lcharette Nov 20, 2020
c45af49
Change compsoer install to update since we don't have .lock
lcharette Nov 22, 2020
ccd37d3
Added GH access token env
lcharette Nov 23, 2020
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
14 changes: 10 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,22 @@ services:
- redis

php:
- 7.1
- 7.2
- 7.3
- 7.4

env:
jobs:
- DB=mysql
COMPOSER=1
- DB=mysql
COMPOSER=2
- DB=sqlite
COMPOSER=1
- DB=pgsql
COMPOSER=1
- DB=memory
COMPOSER=1

jobs:
fast_finish: true
Expand All @@ -28,8 +33,9 @@ cache:
- $HOME/.composer/cache

before_install:
# Force use of Composer 1.x
- composer self-update --1
# Force use of Composer 1x or 2.x
- composer self-update --$COMPOSER
- composer config -g github-oauth.github.com "$TOKEN"
# copy sprinkles.json
- cp app/sprinkles.example.json app/sprinkles.json
# set up db
Expand All @@ -42,7 +48,7 @@ before_install:

before_script:
# install deps and UF
- COMPOSER_MEMORY_LIMIT=-1 travis_retry composer install --no-interaction
- COMPOSER_MEMORY_LIMIT=-1 travis_retry composer update --no-interaction
- php bakery debug
- php bakery build-assets
- php bakery migrate
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -996,3 +996,4 @@ See [http://learn.userfrosting.com/upgrading/40-to-41](Upgrading 4.0.x to 4.1.x
[v4.4.1]: https://github.com/userfrosting/UserFrosting/compare/v4.4.0...v4.4.1
[v4.4.2]: https://github.com/userfrosting/UserFrosting/compare/v4.4.1...v4.4.2
[v4.4.3]: https://github.com/userfrosting/UserFrosting/compare/v4.4.2...v4.4.3
[v4.4.4]: https://github.com/userfrosting/UserFrosting/compare/v4.4.3...v4.4.4
10 changes: 8 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,19 @@
"config": {
"vendor-dir": "app/vendor"
},
"repositories": [
{
"type":"vcs",
"url":"https://github.com/mcaskill/composer-merge-plugin"
}
],
"require": {
"php": ">=7.1",
"php": ">=7.2",
"ext-gd": "*",
"composer/installers": "^1.4.0",
"userfrosting/uniformresourcelocator": "~4.4.0",
"symfony/console": "^4.3",
"wikimedia/composer-merge-plugin": "^1.4.0"
"wikimedia/composer-merge-plugin": "dev-feature/composer-v2 as 1.5.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.13",
Expand Down