diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0eaaa8972..97418eafc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,9 +42,6 @@ npm install: - install -v -m 0700 -d ~/.ssh - install -v -T -m 0644 ${SSH_KNOWN_HOSTS} ~/.ssh/known_hosts - install -v -T -m 0400 ${SSH_DEPLOY_KEY} ~/.ssh/deploy && echo "IdentityFile ~/.ssh/deploy" >> ~/.ssh/config; - after_script: - - zip -qr node_modules.zip node_modules - - du -hs node_modules node_modules.zip artifacts: paths: - node_modules/ @@ -93,11 +90,8 @@ yesod:build:dev: before_script: &haskell - rm -rvf /etc/apt/sources.list /etc/apt/sources.list.d - install -v -T -m 0644 ${APT_SOURCES_LIST} /etc/apt/sources.list - - apt-key add ${LLVM_APT_KEY} - apt update -y - - apt install -y --no-install-recommends locales-all openssh-client llvm-9 - - ln -vsf llc-9 /usr/bin/llc - - ln -vsf opt-9 /usr/bin/opt + - apt install -y --no-install-recommends locales-all openssh-client - install -v -m 0700 -d ~/.ssh - install -v -T -m 0644 ${SSH_KNOWN_HOSTS} ~/.ssh/known_hosts - install -v -T -m 0400 ${SSH_DEPLOY_KEY} ~/.ssh/deploy && echo "IdentityFile ~/.ssh/deploy" >> ~/.ssh/config; @@ -118,7 +112,7 @@ yesod:build:dev: yesod:build: stage: yesod:build script: - - stack build --copy-bins --local-bin-path $(pwd)/bin --flag uniworx:-library-only --flag uniworx:-dev --flag uniworx:pedantic + - stack build --test --copy-bins --local-bin-path $(pwd)/bin --flag uniworx:-library-only --flag uniworx:-dev --flag uniworx:pedantic needs: - frontend:build before_script: *haskell @@ -195,52 +189,12 @@ yesod:test:dev: retry: 2 interruptible: true -hlint: - stage: lint - script: - - stack test --flag uniworx:-library-only --flag uniworx:-dev --flag uniworx:pedantic uniworx:test:hlint - needs: - - frontend:build - before_script: *haskell - dependencies: - - frontend:build - - only: - variables: - - $CI_COMMIT_REF_NAME =~ /^v[0-9].*/ - retry: 2 - interruptible: true - resource_group: ram - -yesod:test: - services: - - name: postgres:10.10 - alias: postgres - - stage: test - script: - - stack test --coverage --flag uniworx:-library-only --flag uniworx:-dev --flag uniworx:pedantic --skip hlint - needs: - - frontend:build - before_script: *haskell - dependencies: - - frontend:build - - only: - variables: - - $CI_COMMIT_REF_NAME =~ /^v[0-9].*/ - retry: 2 - interruptible: true - resource_group: ram - deploy:uniworx3: stage: deploy script: - ssh -i ~/.ssh/id root@uniworx3.ifi.lmu.de =2.0.0.0 - acid-state-0.16.0.1@sha256:d43f6ee0b23338758156c500290c4405d769abefeb98e9bc112780dae09ece6f,6207 - bytebuild-0.3.6.0@sha256:aec785c906db5c7ec730754683196eb99a0d48e0deff7d4034c7b58307040b85,2982