use rules

.gitlab-ci.yml

@@ -2,6 +2,8 @@ stages:
   - build
   - review
 
+variables:
+  PRODUCTION_BRANCH: 'master'
 
 Build for review:
     stage: build
@@ -21,8 +23,8 @@ Build for review:
         - public
     variables:
       JEKYLL_ENV: review
-    except:
-      - master
+    - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME'
+      when: always
     tags:
       - review-app
 
@@ -35,11 +37,10 @@ Publish review:
     stage: review
     script:
       - rsync -av --delete public /srv/nginx/pages/$CI_PROJECT_ID/$CI_MERGE_REQUEST_ID
+    environment:
       name: review $CI_BUILD_REF_NAME for $CI_PROJECT_PATH
       url: http://$CI_MERGE_REQUEST_ID-$CI_PROJECT_ID.review.lcsb.uni.lu
       on_stop: "Un-publish review"
-    except:
-      - master
     tags:
       - review-app
 
@@ -53,8 +54,6 @@ Un-publish review:
   environment:
     name: review $CI_BUILD_REF_NAME for $CI_PROJECT_PATH
     action: stop
-  except:
-    - master
   tags:
     - review-app
       
\ No newline at end of file