Bye bye submodule, hello Makefile! #25513

DeepDiver1975 · 2016-07-18T11:21:31Z

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

PVince81 · 2016-07-19T08:23:58Z

Did a quick test and it seems to work fine.
Also tested SFTP since it uses phpseclib from that bunch, also worked fine.

PVince81 · 2016-08-22T12:25:59Z

@DeepDiver1975 updated guzzle b2906fe so we don't have to once #25525 is merged. Please verify.

PVince81 · 2016-08-22T17:09:20Z

.gitignore

 /config/mount.php
 /apps/inc.php
 /assets
+/composer.phar


Is it common to have it directly under the git root ?

we can also put it into the build folder ...

PVince81 · 2016-08-22T17:14:10Z

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 ?)

PVince81 · 2016-08-22T17:16:35Z

/me now eager to get this merged so we can improve the makefile

DeepDiver1975 · 2016-08-22T20:21:44Z

tools as well (PHPUnit ?)

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 .....

DeepDiver1975 · 2016-08-22T20:37:16Z

Makefile

+all: install-composer-deps
+
+composer.phar:
+	cd build && curl -sS https://getcomposer.org/installer | php


@PVince81 composer.phar is now in build sub folder

PVince81 · 2016-08-23T07:03:49Z

@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 composer update or so be enough to make it adjust lib versions even if there's a downgrade ? (ex: switching from stable11 to stable10)

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 ?

DeepDiver1975 · 2016-08-23T08:03:45Z

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)

DeepDiver1975 · 2016-08-23T08:04:01Z

Would running composer update or so be enough to make it adjust lib versions even if there's a downgrade

composer install it will be

DeepDiver1975 · 2016-08-23T08:04:58Z

composer install will install dependencies as defined in composer.lock which holds the explicit versions.
composer update will update all dependencies according to composer.json and write explciit versions into composer-lock

PVince81 · 2016-08-24T18:25:51Z

ahem...

± % make
make: *** No rule to make target 'build/composer.phar', needed by 'install-composer-deps'.  Stop.

The makefile dependency need to refer to another rule name, not the path to a file.

DeepDiver1975 · 2016-08-24T18:53:25Z

@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?

PVince81 · 2016-08-24T20:22:38Z

@DeepDiver1975 git add build/autotest*.sh build/buildjsdocs*.sh please 😉

PVince81 · 2016-08-24T20:40:58Z

@DeepDiver1975 I already added the missing files and also killed "buildjsdocs.sh" in favor of a more direct command in Makefile 😄

DeepDiver1975 · 2016-08-24T22:30:17Z

🎉 🎉 🎉 ALL GREEN 🎉 🎉 🎉

butonic · 2016-08-25T07:16:03Z

bower.json

+    "blueimp-md5": "1.0.1",
+    "handlebars": "1.3.0",
+    "jcrop": "0.9.12",
+    "jquery": "2.1.4",


why do we need to downgade jquery?

mainly bower version was wrong 😵

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.

VicDeo · 2016-08-29T19:41:59Z

@DeepDiver1975 done

DeepDiver1975 · 2016-08-29T19:42:36Z

@DeepDiver1975 done

THX a lot!

DeepDiver1975 · 2016-08-29T22:30:02Z

All green - we are ready to go

PVince81 · 2016-08-30T08:47:52Z

Makefile

+# Catch-all rules
+#
+.PHONY: all
+all: $(composer_deps) $(core_vendor)


@DeepDiver1975 weird, I thought we changed this to composer_dev_deps ?

PVince81 · 2016-09-02T10:43:45Z

doc ticket for makefile: owncloud-archive/documentation#2604

lock · 2019-08-04T20:02:20Z

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.

DeepDiver1975 added the 3 - To Review label Jul 18, 2016

DeepDiver1975 added this to the 9.2 milestone Jul 18, 2016

DeepDiver1975 force-pushed the bye-bye-submodule branch from 4ed7244 to 7a9e7a1 Compare August 18, 2016 22:57

PVince81 mentioned this pull request Aug 22, 2016

Update guzzlehttp to 5.3.1 #25525

Merged

PVince81 reviewed Aug 22, 2016
View reviewed changes

DeepDiver1975 force-pushed the bye-bye-submodule branch from b2906fe to b166c16 Compare August 22, 2016 20:36

DeepDiver1975 reviewed Aug 22, 2016
View reviewed changes

DeepDiver1975 force-pushed the bye-bye-submodule branch from 1241d86 to b30758b Compare August 24, 2016 19:51

carlaschroder mentioned this pull request Aug 24, 2016

adjust supported php versions in documentation for 9.2 owncloud-archive/documentation#2590

Closed

DeepDiver1975 mentioned this pull request Aug 24, 2016

Update phpseclib to 2.0.2 #25339

Closed

1 task

butonic reviewed Aug 25, 2016
View reviewed changes

DeepDiver1975 mentioned this pull request Aug 25, 2016

errors with phpunit-5.5.2 #25941

Closed

DeepDiver1975 and others added 13 commits August 29, 2016 21:30

Move autotest*.sh and buildjsdoc.sh into build sub folder

38265f9

Adjusted versions in bower.json

f99019b

Fix bower deps to have fixed versions

b952f1c

We should only change/save the versions when manually updating. This way the versions stay locked in place.

Fixed autotest scripts, added jsdoc rule

e8268b9

Added integration tests in Makefile

eb81932

Fix for test-js makefile dep + other

bb6ff8d

Makefile vars and adjusted Jenkinsfile

c903afe

Added TEST_DATABASE and TEST_EXTERNAL to specify which env to test in. Adjusted Jenkinsfile

Add make command to update license file headers

ff373ee

Small tweaks in makefile

308df14

Add phpunit from composer

5b859b3

Fix composer autoloader

f091aca

Sometimes require_once would return true if the autoloader was already loaded previously from a previous run of PHPUnit

Fixed Makefile dependencies to only build them once

3eb54d6

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.

Makefile: separate dev and release deps

2170387

DeepDiver1975 force-pushed the bye-bye-submodule branch from c861173 to 6996a68 Compare August 29, 2016 19:31

VicDeo mentioned this pull request Aug 29, 2016

[For 9.2] Require PHP 5.6.0 at least owncloud/administration#92

Merged

DeepDiver1975 force-pushed the bye-bye-submodule branch from 6996a68 to 3db7d8d Compare August 29, 2016 19:45

DeepDiver1975 added 2 commits August 29, 2016 22:53

Fix travis

b6bacfa

Handle error when composer was not called

07f7fcb

DeepDiver1975 force-pushed the bye-bye-submodule branch from 4bf33d6 to 07f7fcb Compare August 29, 2016 20:53

DeepDiver1975 merged commit 005b3db into master Aug 29, 2016

DeepDiver1975 deleted the bye-bye-submodule branch August 29, 2016 22:30

butonic mentioned this pull request Aug 30, 2016

3rdparty packages blocked upgrades #20787

Closed

PVince81 reviewed Aug 30, 2016
View reviewed changes

stenstad mentioned this pull request Sep 24, 2016

Support of Swift V3 Auth aka Identity v3 API for Swift Object Storage nextcloud/server#1504

Closed

lock bot locked as resolved and limited conversation to collaborators Aug 4, 2019

Bye bye submodule, hello Makefile! #25513

Bye bye submodule, hello Makefile! #25513

Uh oh!

Conversation

DeepDiver1975 commented Jul 18, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

PVince81 commented Jul 19, 2016

Uh oh!

PVince81 commented Aug 22, 2016

Uh oh!

PVince81 Aug 22, 2016

Choose a reason for hiding this comment

Uh oh!

DeepDiver1975 Aug 22, 2016

Choose a reason for hiding this comment

Uh oh!

PVince81 commented Aug 22, 2016

Uh oh!

PVince81 commented Aug 22, 2016

Uh oh!

DeepDiver1975 commented Aug 22, 2016

Uh oh!

DeepDiver1975 Aug 22, 2016

Choose a reason for hiding this comment

Uh oh!

PVince81 commented Aug 23, 2016

Uh oh!

DeepDiver1975 commented Aug 23, 2016

Uh oh!

DeepDiver1975 commented Aug 23, 2016

Uh oh!

DeepDiver1975 commented Aug 23, 2016

Uh oh!

PVince81 commented Aug 24, 2016

Uh oh!

DeepDiver1975 commented Aug 24, 2016

Uh oh!

PVince81 commented Aug 24, 2016

Uh oh!

PVince81 commented Aug 24, 2016

Uh oh!

DeepDiver1975 commented Aug 24, 2016

Uh oh!

butonic Aug 25, 2016

Choose a reason for hiding this comment

Uh oh!

DeepDiver1975 Aug 25, 2016

Choose a reason for hiding this comment

Uh oh!

DeepDiver1975 Aug 25, 2016

Choose a reason for hiding this comment

Uh oh!

VicDeo commented Aug 29, 2016

Uh oh!

DeepDiver1975 commented Aug 29, 2016

Uh oh!

DeepDiver1975 commented Aug 29, 2016

Uh oh!

PVince81 Aug 30, 2016

Choose a reason for hiding this comment

Uh oh!

PVince81 commented Sep 2, 2016

Uh oh!

lock bot commented Aug 4, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

DeepDiver1975 commented Jul 18, 2016 •

edited

Loading