Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Noua Toukourou
courses
Commits
90d91bac
Commit
90d91bac
authored
Jul 09, 2020
by
Laurent Heirendt
✈
Browse files
Merge branch 'develop' into 'master'
Develop See merge request
!87
parents
d1e874b6
0dbbf4b7
Changes
2
Hide whitespace changes
Inline
Side-by-side
.ci/deploy.sh
View file @
90d91bac
...
...
@@ -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
View file @
90d91bac
...
...
@@ -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
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment