[DIFE-2122] Relax the Gemspec requirements in libraries

Merge branch 'feature/DIFE-2122' into 'master'

See merge request future-of-europe/digit-cofe-libraries/digit-cofe-sitemap!10

.gitlab-ci.yml

@@ -10,26 +10,18 @@ variables:
   SIMPLECOV: "true"
   CI: "true"
   RAILS_ENV: test
+  EDGE: "false"
 
 services:
   - name: registry.fpfis.eu/future-of-europe/comm-cofe-reference/postgres:10.13-alpine
     alias: postgres
 
 stages:
-  - install
   - build
 
-install:
-  image: registry.fpfis.eu/future-of-europe/comm-cofe-reference/test:3.0.2
-  stage: install
-  script:
-    - gem install bundler -v $(grep -A 1 "BUNDLED WITH" Gemfile.lock | tail -1 | cut -d " " -f 4)
-    - bundle config set path "/cache/$CI_PROJECT_NAME/vendor/bundle"
-    - counter=0; until [ "$counter" -ge 20 ]; do bundle install --jobs 4 --retry 3 && break; counter=$((counter+1)); sleep 1; done
-
 rubocop:
   stage: build
-  image: registry.fpfis.eu/future-of-europe/comm-cofe-reference/test:3.0.2
+  image: registry.fpfis.eu/future-of-europe/comm-cofe-reference/cofe-test:3.0.2
   artifacts:
     name: rubocop
     when: always
@@ -37,19 +29,18 @@ rubocop:
       - rubocop/
   script:
     - gem install bundler -v $(grep -A 1 "BUNDLED WITH" Gemfile.lock | tail -1 | cut -d " " -f 4)
-    - bundle config set path "/cache/$CI_PROJECT_NAME/vendor/bundle"
-    - counter=0; until [ "$counter" -ge 20 ]; do bundle install --jobs 4 --retry 3 --local && break; counter=$((counter+1)); sleep 1; done
-    - bundle exec rubocop --format html --out rubocop/index.html  lib/ spec/
+    - bundle install --jobs 4 --retry 3
+    - bundle exec rubocop --format html --out rubocop/index.html lib/ spec/
 
 rubycritic:
   stage: build
-  image: registry.fpfis.eu/future-of-europe/comm-cofe-reference/test:3.0.2
+  image: registry.fpfis.eu/future-of-europe/comm-cofe-reference/cofe-test:3.0.2
   script:
     - gem install rubycritic
     - rubycritic --no-browser app config lib
 
-test:
-  image: registry.fpfis.eu/future-of-europe/comm-cofe-reference/test:3.0.2
+.test:
+  image: registry.fpfis.eu/future-of-europe/comm-cofe-reference/cofe-test:3.0.2
   stage: build
   coverage: '/\(\d+.\d+\%\) covered/'
   artifacts:
@@ -64,13 +55,35 @@ test:
       coverage_report:
         coverage_format: cobertura
         path: coverage/coverage.xml
-  script:
+  before_script:
     - gem install bundler -v $(grep -A 1 "BUNDLED WITH" Gemfile.lock | tail -1 | cut -d " " -f 4)
-    - bundle config set path "/cache/$CI_PROJECT_NAME/vendor/bundle"
-    - counter=0; until [ "$counter" -ge 20 ]; do bundle install --jobs 4 --retry 3 --local && break; counter=$((counter+1)); sleep 1; done
+    - bundle update decidim decidim-dev
     - bundle exec rake test_app
     - mkdir -p ./spec/decidim_dummy_app/tmp/screenshots
     - cd ./spec/decidim_dummy_app/
     - RAILS_ENV=test bundle exec rails assets:precompile
     - cd ../../
+  script:
     - bundle exec rspec spec/
+
+test stable:
+  extends: .test
+  variables:
+    DECIDIM_VERSION: "~> 0.27.0.rc1"
+
+test edge:
+  extends: .test
+  image: registry.fpfis.eu/future-of-europe/comm-cofe-reference/cofe-test:3.1.1
+  allow_failure: true
+  variables:
+    EDGE: "true"
+  before_script:
+    - gem install bundler -v $(grep -A 1 "BUNDLED WITH" Gemfile.lock | tail -1 | cut -d " " -f 4)
+    - bundle update decidim decidim-dev
+    - bundle exec rake test_app
+    - mkdir -p ./spec/decidim_dummy_app/tmp/screenshots
+    - cd ./spec/decidim_dummy_app/
+    - RAILS_ENV=test bundle exec rails assets:precompile
+    - cd ../../
+  script:
+    - bundle exec rspec spec/
\ No newline at end of file

Gemfile

@@ -4,7 +4,11 @@ source "https://rubygems.org"
 
 ruby RUBY_VERSION
 
-DECIDIM_VERSION = { github: "decidim/decidim", branch: "develop" }.freeze
+if ENV.fetch("EDGE", "false") == "true"
+  DECIDIM_VERSION = { github: "decidim/decidim", branch: "develop" }.freeze
+else
+  DECIDIM_VERSION = ENV.fetch("DECIDIM_VERSION", "~> 0.27.0.rc1")
+end
 
 gem "decidim", DECIDIM_VERSION
 gem "decidim-admin", DECIDIM_VERSION

decidim-sitemaps.gemspec

@@ -28,7 +28,6 @@ Gem::Specification.new do |spec|
 
   spec.files = Dir["{app,config,db,lib}/**/*", "LICENSE-AGPLv3.txt", "Rakefile", "README.md"]
 
-  # spec.add_dependency "rails", "~> 6.1"
   spec.add_dependency "decidim-core"
   spec.add_dependency "sitemap_generator"
   spec.add_development_dependency "decidim-dev"