[release] Regular merge of develop

.ci/deploy.sh

@@ -10,9 +10,9 @@ rm -rf $rootDir/public
 rm -rf $rootDir/theme
 mkdir $rootDir/public
 
-if [[ $CI_COMMIT_BRANCH == "develop" ]]; then
+if [[ $CI_COMMIT_REF_NAME == "develop" ]]; then
     version="latest";
-elif [[ $CI_COMMIT_BRANCH == "master" ]]; then
+elif [[ $CI_COMMIT_REF_NAME == "master" ]]; then
     version="stable";
 else
     version="unstable";
@@ -59,7 +59,7 @@ do
                 yarn install
 
                 grunt dist
-                mv public/* $rootDir/public/$BLADE/$version/.
+                cp -rL public/* $rootDir/public/$BLADE/$version/.
 
                 echo " > latest built for file set ${BLADE}"