Merge branch 'fix-gitlab-build' into 'master'

Fix up some build issues before they happen

See merge request openlp/web-remote!49

.gitlab-ci.yml

@@ -21,12 +21,25 @@ test:
   except:
     - tags
 
-build:
+build-branch:
   stage: build
   script:
     - yarn install
-    - yarn build --no-progress --prod --aot
+    - yarn build --no-progress --configuration production --aot
-    - 'echo "let window.appVersion = \"$CI_COMMIT_TAG\";" >> dist/web-remote/assets/version.js'
+    - export APP_VERSION=`git describe --dirty --tags --long --match '*[0-9]*'`
+    - 'echo "window.appVersion = \"$APP_VERSION\";" > dist/web-remote/assets/version.js'
+  artifacts:
+    paths:
+      - dist/
+  only:
+    - branches
+
+build-tag:
+  stage: build
+  script:
+    - yarn install
+    - yarn build --no-progress --configuration production --aot
+    - 'echo "window.appVersion = \"$CI_COMMIT_TAG\";" > dist/web-remote/assets/version.js'
   artifacts:
     paths:
       - dist/