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
Bye bye submodule, hello Makefile! #25513
Conversation
DeepDiver1975
commented
Jul 18, 2016
•
edited
edited
- adjust supported php versions in documentation for 9.2 - we only support 5.6 and 7.0 @carlaschroder - adjust supported php versions in documentation for 9.2 owncloud-archive/documentation#2590
- adjust php version check in web setup @VicDeo [For 9.2] Require PHP 5.6.0 at least administration#92
- adjust php version check in updater @VicDeo Require PHP 5.6.0 or above updater#372
- adjust release script to call make @PVince81 @DeepDiver1975
- adjust jenkinsfile to call make to run phpunit tests and have databases as parameter
- adjust travis before install https://github.com/owncloud/administration/blob/master/travis-ci/before_install.sh#L20 -Adding makefile support administration#93
Did a quick test and it seems to work fine. |
4ed7244
to
7a9e7a1
Compare
@DeepDiver1975 updated guzzle b2906fe so we don't have to once #25525 is merged. Please verify. |
@@ -6,6 +6,7 @@ | |||
/config/mount.php | |||
/apps/inc.php | |||
/assets | |||
/composer.phar |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it common to have it directly under the git root ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we can also put it into the build folder ...
Tested, works. My only concern is about bootstrapping the composer phar file directly into the git root. Would be better to have it into an excluded subdirectory or so, keeping in mind that we might want to bootstrap other tools as well (PHPUnit ?) |
/me now eager to get this merged so we can improve the makefile |
we will grab phpunit via composer - that way we have one explicit version in every branch - much easier compared to the kung-fu we use in autotest.sh. in addition phpunit 5.*+ require php 5.6+ - we need to user different versions anyhow ..... |
b2906fe
to
b166c16
Compare
all: install-composer-deps | ||
|
||
composer.phar: | ||
cd build && curl -sS https://getcomposer.org/installer | php |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@PVince81 composer.phar is now in build sub folder
@DeepDiver1975 this also means that switching between stable branches might require the dev to rerun composer (assuming all branches have it at some point). Would running It also means that CI will have to fetch all dependencies for every run. I guess there will be a repository cache for composer packages somewhere on Jenkins ? |
as long as we use explicit version and not git branch names (like dev-master) composer is caching the packages (btw: unlike npm as far as I know) |
composer install it will be |
composer install will install dependencies as defined in composer.lock which holds the explicit versions. |
ahem...
The makefile dependency need to refer to another rule name, not the path to a file. |
@PVince81 composer cannot resolve the dependencies for php 5.4 and 5.5 - since we anyhow want to drop 5.4 and 5.5: shall we do it in here right away? |
1241d86
to
b30758b
Compare
@DeepDiver1975 |
@DeepDiver1975 I already added the missing files and also killed "buildjsdocs.sh" in favor of a more direct command in Makefile 😄 |
"blueimp-md5": "1.0.1", | ||
"handlebars": "1.3.0", | ||
"jcrop": "0.9.12", | ||
"jquery": "2.1.4", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why do we need to downgade jquery?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
mainly bower version was wrong 😵
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
and we need to explicitly pin the versions
We should only change/save the versions when manually updating. This way the versions stay locked in place.
Added TEST_DATABASE and TEST_EXTERNAL to specify which env to test in. Adjusted Jenkinsfile
Sometimes require_once would return true if the autoloader was already loaded previously from a previous run of PHPUnit
This way composer.phar, composer libs, node js and core vendor libs are only fetched once. If make detects that the directory exists, it will skip the step. This is good for faster builds.
c861173
to
6996a68
Compare
@DeepDiver1975 done |
THX a lot! |
6996a68
to
3db7d8d
Compare
4bf33d6
to
07f7fcb
Compare
All green - we are ready to go |
# Catch-all rules | ||
# | ||
.PHONY: all | ||
all: $(composer_deps) $(core_vendor) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@DeepDiver1975 weird, I thought we changed this to composer_dev_deps
?
doc ticket for makefile: owncloud-archive/documentation#2604 |
This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs. |