Merge branch 'develop' into 'master'

Develop

See merge request R3/school/courses!87

.ci/deploy.sh

@@ -7,6 +7,7 @@ echo $rootDir
 
 # clean previous builds
 rm -rf $rootDir/public
+rm -rf $rootDir/theme
 mkdir $rootDir/public
 
 if [[ $CI_COMMIT_BRANCH == "develop" ]]; then
@@ -19,7 +20,6 @@ fi
 
 # build the unstable version - can be optimized
 git submodule update --init --recursive
-git submodule foreach --recursive git reset --hard
 
 # add matomo
 sed -i "/matomohead/r./.ci/analytics/head.html" theme/templates/_index.html

.gitlab-ci.yml

@@ -61,6 +61,8 @@ build:courses:
   rules:
     - if: $CI_COMMIT_BRANCH == "develop"
     - if: $CI_COMMIT_BRANCH == "master"
+  before_script:
+    - git submodule update --init --recursive
   script:
     - bash .ci/deploy.sh
   artifacts: