Merge branch 'develop' into 'master'

Regular merge of develop See merge request R3/school/basic.git.slides!40

Merge branch 'develop' into 'master'
Regular merge of develop See merge request R3/school/basic.git.slides!40
4403c2f9 · Laurent Heirendt · f71fa9ac · f1168a2a · 4403c2f9 · 4403c2f9
Commit 4403c2f9 authored 5 years ago by Laurent Heirendt
--- a/.autoRedirect
+++ b/.autoRedirect
 <html>
 <head>
-<meta http-equiv="refresh" content="0; url=https://r3.pages.uni.lu/school/git.slides/stable"/>
+<meta http-equiv="refresh" content="0; url=https://r3.pages.uni.lu/school/basic.git.slides/stable"/>
 </head>

 <body>

--- a/.ci/deploy.sh
+++ b/.ci/deploy.sh
+#!/bin/bash
+
+# install npm
+npm install -g npm@latest yo grunt-cli generator-reveal bower
+npm install
+
+# build the master version into stable
+git fetch --tags
+latestTag=$(git describe --tags `git rev-list --tags --max-count=1`)
+git checkout $latestTag
+grunt dist
+mkdir stable
+mv public/* stable/.
+
+# build the develop version into latest
+git checkout -f develop
+git fetch origin develop
+git reset --hard origin/develop
+grunt dist
+mkdir latest
+mv public/* latest/.
+
+# deploy the stable and latest directories
+mv stable public/.
+mv latest public/.
+
+# auto redirect file
+cp .ci/.autoRedirect public/index.html
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,31 +7,7 @@ pages:
    - master
  script:
    # install npm
-    - npm install -g npm@latest yo grunt-cli generator-reveal bower
-    - npm install
-
-    # build the master version into stable
-    - git fetch --tags
-    - latestTag=$(git describe --tags `git rev-list --tags --max-count=1`)
-    - git checkout $latestTag
-    - grunt dist
-    - mkdir stable
-    - mv public/* stable/.
-
-    # build the develop version into latest
-    - git checkout -f develop
-    - git fetch origin develop
-    - git reset --hard origin/develop
-    - grunt dist
-    - mkdir latest
-    - mv public/* latest/.
-
-    # deploy the stable and latest directories
-    - mv stable public/.
-    - mv latest public/.
-
-    # auto redirect file
-    - cp .autoRedirect public/index.html
+    - bash .ci/deploy.sh

  artifacts:
    paths: