From a4a8b263d687d70562aaa613cd57c88cfba6ea06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 16 May 2018 09:08:20 +0200 Subject: [PATCH 1/4] Make sure github clones use https MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- build/composer.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build/composer.json b/build/composer.json index c051dae66..fd7e9fc73 100644 --- a/build/composer.json +++ b/build/composer.json @@ -3,11 +3,14 @@ "repositories": [ { "type": "vcs", - "url": "https://github.com/juliushaertl/reflection.git" + "url": "https://github.com/juliushaertl/reflection" } ], "require": { "juliushaertl/phpdoc-to-rst": "dev-php7.0", "phpdocumentor/reflection": "dev-php7.0" + }, + "config": { + "github-protocols": ["https"] } } From c1304f5330ececbac1f813fd99533d4b5ad08425 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 16 May 2018 09:37:55 +0200 Subject: [PATCH 2/4] Only build master/stable branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 7ab1777e0..a47a6885b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,3 +3,4 @@ pipeline: image: nextcloudci/documentation:documentation-5 commands: - make all +branches: [ master, stable* ] From 3a7fc4b567c2b82d8b6b13601c149f7399354485 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 16 May 2018 09:43:22 +0200 Subject: [PATCH 3/4] Use github without api MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- build/composer.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build/composer.json b/build/composer.json index fd7e9fc73..ad3512ffb 100644 --- a/build/composer.json +++ b/build/composer.json @@ -2,8 +2,9 @@ "minimum-stability": "dev", "repositories": [ { - "type": "vcs", - "url": "https://github.com/juliushaertl/reflection" + "type": "github", + "url": "https://github.com/juliushaertl/reflection", + "no-api": true } ], "require": { From 4b7eb6c03fed2f8fef38b6e7c53113137f1932f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 16 May 2018 09:52:07 +0200 Subject: [PATCH 4/4] Build docs from master MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 66107bc6a..f98f77988 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ developer-manual-pdf: @echo "Developer manual build finished; PDF is updated" api-docs: clean-api-docs - cd build && sh get-server-sources.sh stable13 + cd build && sh get-server-sources.sh master mkdir -p developer_manual/api/ cd build && composer install && composer update cd build && php generateApiDoc.php