From 9a0c8e20267ca022f45d8e1c67c39f9bf95a5049 Mon Sep 17 00:00:00 2001 From: Louis Charette Date: Fri, 20 Nov 2020 16:26:36 -0500 Subject: [PATCH 1/4] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f10b67a0..093b9cdf2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 From 32bf350c04147c3ba1b72006e00b48351ddf5490 Mon Sep 17 00:00:00 2001 From: Louis Charette Date: Fri, 20 Nov 2020 16:53:07 -0500 Subject: [PATCH 2/4] Testing composer-merge-plugin fix --- .travis.yml | 7 +++++-- composer.json | 8 +++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e8eb42d2f..ad54895d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,9 @@ php: env: jobs: - DB=mysql + COMPOSER=1 + - DB=mysql + COMPOSER=2 - DB=sqlite - DB=pgsql - DB=memory @@ -28,8 +31,8 @@ cache: - $HOME/.composer/cache before_install: - # Force use of Composer 1.x - - composer self-update --1 + # Force use of Composer 2.x + - composer self-update --$COMPOSER # copy sprinkles.json - cp app/sprinkles.example.json app/sprinkles.json # set up db diff --git a/composer.json b/composer.json index 47d3b9d16..e21913528 100755 --- a/composer.json +++ b/composer.json @@ -23,13 +23,19 @@ "config": { "vendor-dir": "app/vendor" }, + "repositories": [ + { + "type":"vcs", + "url":"https://github.com/mcaskill/composer-merge-plugin" + } + ], "require": { "php": ">=7.1", "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", From c45af499fb5c16d131f14ebbffba697f6ea73ab4 Mon Sep 17 00:00:00 2001 From: Louis Charette Date: Sun, 22 Nov 2020 12:57:49 -0500 Subject: [PATCH 3/4] Change compsoer install to update since we don't have .lock --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ad54895d5..388a0c258 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,7 +45,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 From ccd37d35dd3299404fcad4dce448013ad1cd3c61 Mon Sep 17 00:00:00 2001 From: Louis Charette Date: Sun, 22 Nov 2020 21:13:53 -0500 Subject: [PATCH 4/4] Added GH access token env --- .travis.yml | 7 +++++-- composer.json | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 388a0c258..e3c179e44 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,6 @@ services: - redis php: - - 7.1 - 7.2 - 7.3 - 7.4 @@ -20,8 +19,11 @@ env: - DB=mysql COMPOSER=2 - DB=sqlite + COMPOSER=1 - DB=pgsql + COMPOSER=1 - DB=memory + COMPOSER=1 jobs: fast_finish: true @@ -31,8 +33,9 @@ cache: - $HOME/.composer/cache before_install: - # Force use of Composer 2.x + # 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 diff --git a/composer.json b/composer.json index e21913528..899e054a5 100755 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ } ], "require": { - "php": ">=7.1", + "php": ">=7.2", "ext-gd": "*", "composer/installers": "^1.4.0", "userfrosting/uniformresourcelocator": "~4.4.0",