Cut staging from master #823

Merged
skhameneh merged 24 commits from master into staging 2018-12-14 23:53:07 +01:00
Showing only changes of commit d3741c5da1 - Show all commits

View file

@ -18,16 +18,8 @@ cache:
jobs: jobs:
include: include:
- stage: "Configure" - stage: "Setup"
name: "Configure Spee.ch" name: "Setup Build Environment"
script:
- cp ./cli/defaults/* ./site/config/
- |
echo \'{ "sessionKey": "session", "masterPassword": false }\' > ./site/private/authConfig.json
- stage: "Build"
name: "Build Spee.ch"
before_install: before_install:
# - sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('password') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;" # - sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('password') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;"
@ -42,6 +34,17 @@ jobs:
install: install:
- npm i - npm i
- stage: "Configure"
name: "Configure Spee.ch"
script:
- cp ./cli/defaults/* ./site/config/
- |
echo \'{ "sessionKey": "session", "masterPassword": false }\' > ./site/private/authConfig.json
- stage: "Build"
name: "Build Spee.ch"
script: script:
# - npm run fix # - npm run fix
- npm run build - npm run build