Merge pull request #6826 from opf/housekeeping/merge-plugins-as-modules

[28728] Merge OpenProject CE plugins under modules/
opf · Nov 15, 2018 · 550c87a · 550c87a
2 parents c09fd76 + a35168d
commit 550c87a
Show file tree

Hide file tree

Showing 1,646 changed files with 126,215 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -26,16 +26,6 @@
 # See doc/COPYRIGHT.rdoc for more details.
 #++
 
-
-###################################
-#
-# This file was generated by
-# openproject-devkit.
-#
-# Do not modify this file directly!
-#
-###################################
-
 language: ruby
 
 rvm:
@@ -184,7 +174,42 @@ jobs:
       script:
       - bash script/ci/setup.sh features postgres
       - bash script/ci/runner.sh features 4 4
-
+    - stage: test
+      name: 'plugins:units (1/1) - mysql'
+      script:
+      - bash script/ci/setup.sh plugins:units mysql
+      - bash script/ci/runner.sh plugins:units 1 1
+      if: head_branch !~ /^core\//
+    - stage: test
+      name: 'plugins:units (1/1) - postgres'
+      script:
+      - bash script/ci/setup.sh plugins:units postgres
+      - bash script/ci/runner.sh plugins:units 1 1
+      if: head_branch !~ /^core\//
+    - stage: test
+      name: 'plugins:features (1/1) - mysql'
+      script:
+      - bash script/ci/setup.sh plugins:features mysql
+      - bash script/ci/runner.sh plugins:features 1 1
+      if: head_branch !~ /^core\//
+    - stage: test
+      name: 'plugins:features (1/1) - postgres'
+      script:
+      - bash script/ci/setup.sh plugins:features postgres
+      - bash script/ci/runner.sh plugins:features 1 1
+      if: head_branch !~ /^core\//
+    - stage: test
+      name: 'plugins:cucumber (1/1) - mysql'
+      script:
+      - bash script/ci/setup.sh plugins:cucumber mysql
+      - bash script/ci/runner.sh plugins:cucumber 1 1
+      if: head_branch !~ /^core\//
+    - stage: test
+      name: 'plugins:cucumber (1/1) - postgres'
+      script:
+      - bash script/ci/setup.sh plugins:cucumber postgres
+      - bash script/ci/runner.sh plugins:cucumber 1 1
+      if: head_branch !~ /^core\//
 
 addons:
   chrome: stable

diff --git a/Gemfile b/Gemfile
@@ -290,7 +290,7 @@ group :docker, optional: true do
 end
 
 # Load Gemfile.local, Gemfile.plugins, plugins', and custom Gemfiles
-gemfiles = Dir.glob File.expand_path('../{Gemfile.local,Gemfile.plugins,lib/plugins/*/Gemfile}',
+gemfiles = Dir.glob File.expand_path('../{Gemfile.modules,Gemfile.local,Gemfile.plugins,lib/plugins/*/Gemfile}',
                                      __FILE__)
 gemfiles << ENV['CUSTOM_PLUGIN_GEMFILE'] unless ENV['CUSTOM_PLUGIN_GEMFILE'].nil?
 gemfiles.each do |file|