Commit 90d91bac authored by Laurent Heirendt's avatar Laurent Heirendt
Browse files

Merge branch 'develop' into 'master'

Develop

See merge request R3/school/courses!87
parents d1e874b6 0dbbf4b7
Pipeline #29649 passed with stages
in 3 minutes and 28 seconds
...@@ -7,6 +7,7 @@ echo $rootDir ...@@ -7,6 +7,7 @@ echo $rootDir
# clean previous builds # clean previous builds
rm -rf $rootDir/public rm -rf $rootDir/public
rm -rf $rootDir/theme
mkdir $rootDir/public mkdir $rootDir/public
if [[ $CI_COMMIT_BRANCH == "develop" ]]; then if [[ $CI_COMMIT_BRANCH == "develop" ]]; then
...@@ -19,7 +20,6 @@ fi ...@@ -19,7 +20,6 @@ fi
# build the unstable version - can be optimized # build the unstable version - can be optimized
git submodule update --init --recursive git submodule update --init --recursive
git submodule foreach --recursive git reset --hard
# add matomo # add matomo
sed -i "/matomohead/r./.ci/analytics/head.html" theme/templates/_index.html sed -i "/matomohead/r./.ci/analytics/head.html" theme/templates/_index.html
......
...@@ -61,6 +61,8 @@ build:courses: ...@@ -61,6 +61,8 @@ build:courses:
rules: rules:
- if: $CI_COMMIT_BRANCH == "develop" - if: $CI_COMMIT_BRANCH == "develop"
- if: $CI_COMMIT_BRANCH == "master" - if: $CI_COMMIT_BRANCH == "master"
before_script:
- git submodule update --init --recursive
script: script:
- bash .ci/deploy.sh - bash .ci/deploy.sh
artifacts: artifacts:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment