Merge branch 'serverchange' into 'testing'

Update .gitlab-ci.yml See merge request !59

Merge branch 'serverchange' into 'testing'
Update .gitlab-ci.yml See merge request !59
bd9b493e · Wolfgang Knopki · f3340cf2 · bbae69cc · bd9b493e
Commit bd9b493e authored 4 years ago by Wolfgang Knopki
Hide whitespace changes
Inline Side-by-side

Showing

with 2 additions and 1 deletion
+2 -1
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,7 @@
 variables:
  JAVA_HOME: "/opt/jdk-12"
  EXPORT_PAGES_DIR: "/var/www/html/"
+  EXPORT_PAGES_DIR_TEST: "/data/www/html/"

 pages-master:    
  stage: deploy
@@ -42,7 +43,7 @@ pages-devel:
    - cp -r fonts .public
    - cp *.html .public
    - mv .public public
-    - cp -r public/* "$EXPORT_PAGES_DIR"
+    - cp -r public/* "$EXPORT_PAGES_DIR_TEST"
  artifacts:
    paths:
      - public