Merge branch 'anothertest' into 'master'

Anothertest

See merge request !2

.gitlab-ci.yaml → .gitlab-ci.yml

+stages:
+  - build
+  - review
+
+variables:
+  GIT_STRATEGY: clone
+
+
 Build for review:
     stage: build
     before_script:
-      - bundle install --path ~/.gem && bundle update
+      - bundle config set path '/home/gitlab-runner/.gem'
+      - bundle install && bundle update
     script:
       - 'echo "project_id: $CI_PROJECT_ID" > _config_review.yml'    
       - 'echo "project_namespace: $CI_PROJECT_PATH" >> _config_review.yml'
-      - 'echo "mr_id: $CI_MERGE_REQUEST_ID" >> _config_review.yml'
+      - 'echo "mr_id: $CI_MERGE_REQUEST_IID" >> _config_review.yml'
       - 'echo "gitlab_host: https://git-r3lab.uni.lu" >> _config_review.yml'
+      - pwd
       - bundle exec jekyll build -d public --config "_config.yml,_config_review.yml"
     artifacts:
       expire_in: 1 month
@@ -14,24 +24,36 @@ Build for review:
         - public
     variables:
       JEKYLL_ENV: review
-    only:
-      - branches@$CI_PROJECT_PATH.pages.uni.lu
-    except:
-      - master
+    rules:
+      - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME'
     tags:
       - review-app
-  
-  Publish review:
+
+
+Publish review:
     stage: review
     script:
-      - rsync -av --delete public /srv/nginx/pages/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_BUILD_REF_SLUG
+      - rsync -av --delete public /srv/nginx/pages/$CI_PROJECT_ID/$CI_MERGE_REQUEST_IID
     environment:
-      name: review $CI_BUILD_REF_NAME for $CI_PROJECT_PATH
-      url: http://CI_BUILD_REF_SLUG-$CI_PROJECT_NAME-$CI_PROJECT_NAMESPACE.review.lcsb.uni.lu
+      name: review/$CI_BUILD_REF_NAME/$CI_PROJECT_PATH
+      url: http://$CI_MERGE_REQUEST_IID-$CI_PROJECT_ID.review.lcsb.uni.lu
       on_stop: "Un-publish review"
-    only:
-      - branches@$CI_PROJECT_PATH.pages.uni.lu
-    except:
-      - master
+      auto_stop_in: 1 week
+    rules:
+      - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME'
     tags:
-      - review-app
\ No newline at end of file
+      - review-app
+
+Un-publish review:
+  stage: review
+  script:
+    - rm -rf /srv/nginx/pages/$CI_PROJECT_ID/$CI_MERGE_REQUEST_IID
+  variables:
+    GIT_STRATEGY: none
+  when: manual
+  environment:
+    name: review/$CI_BUILD_REF_NAME/$CI_PROJECT_PATH
+    action: stop
+  tags:
+    - review-app
+      
\ No newline at end of file

Gemfile

@@ -20,10 +20,6 @@ gem 'jekyll-theme-lcsb-default', '~> 0.3'
 
 # If you have any plugins, put them here!
 group :jekyll_plugins do
- gem "jekyll-paginate-v2", 
-     "~> 2",
-     :git => "https://github.com/sverrirs/jekyll-paginate-v2.git"
-
  gem "jekyll-feed", 
      "~> 0.6"
 

Gemfile.lock

@@ -6,13 +6,6 @@ GIT
     jekyll-theme-lcsb-frozen-components (0.0.2)
       jekyll (> 3.0)
 
-GIT
-  remote: https://github.com/sverrirs/jekyll-paginate-v2.git
-  revision: f8664cf68b59de823b88d4e6b1b985457f2c13af
-  specs:
-    jekyll-paginate-v2 (2.1.0)
-      jekyll (>= 3.0, < 5.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -97,7 +90,7 @@ DEPENDENCIES
   bundler (> 2.0)
   jekyll (~> 4.0)
   jekyll-feed (~> 0.6)
-  jekyll-paginate-v2 (~> 2)!
+  jekyll-paginate-v2 (~> 3)!
   jekyll-theme-lcsb-default (~> 0.3)
   jekyll-theme-lcsb-frozen-components (~> 0.0.1)!
   minima (~> 2.5)

README.md

+# App-review setup with Jekyll
+
+
+1. Ask a sysadmin to enable the review-app runner for your project.
+ 
+2. Copy the `.gitlab-ci.yml` parts to your CI configuration.
+
+> Visual review is working only for public projects: support for private is [planned](https://gitlab.com/gitlab-org/gitlab/-/issues/42750). 
+
+> Review app will work on merge requests.
\ No newline at end of file

_config.yml

@@ -56,7 +56,6 @@ markdown: kramdown
 theme: jekyll-theme-lcsb-default
 plugins:
   - jekyll-feed
-  - jekyll-paginate-v2
   - jekyll-theme-lcsb-frozen-components
 
 # Exclude from processing. (no need to touch these)

index.md

@@ -5,8 +5,7 @@ order: 1
 ---
 
 # App review test index
-This is a App review index in development.
-
+This is a App review index. For more information on how to setup app review for your project, please look at the README.md
 
 ### Other problems?