diff --git a/.travis.yml b/.travis.yml index 2c25fd2e7..3a546b5f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,16 +10,11 @@ cache: # install # nothing -jobs: - include: - - stage: Test and Build - script: - - cd styleguide && yarn install --production=false --frozen-lockfile --non-interactive --ignore-engines - - yarn run styleguide:build - - yarn install --frozen-lockfile --non-interactive --ignore-engines - # - yarn run ci - - script: - - docker build --build-arg BUILD_COMMIT=$TRAVIS_COMMIT -t humanconnection/webapp . +before_script: + - docker build --build-arg BUILD_COMMIT=$TRAVIS_COMMIT -t humanconnection/webapp . + +script: + - docker run humanconnection/webapp yarn run lint after_success: - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh @@ -28,19 +23,8 @@ after_success: - if [ $TRAVIS_BRANCH == "master" ] && [ $TRAVIS_EVENT_TYPE == "push" ]; then docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD" && docker tag humanconnection/webapp humanconnection/webapp:latest && - docker push humanconnection/webapp:latest && - wget https://raw.githubusercontent.com/Human-Connection/Discord-Bot/develop/tester.sh && - chmod +x tester.sh && - ./tester.sh nitro-alpha $WEBHOOK_URL; + docker push humanconnection/webapp:latest fi -# - if [ $TRAVIS_BRANCH == "develop" ] && [ $TRAVIS_EVENT_TYPE == "push" ]; then -# docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD" && -# docker tag humanconnection/webapp humanconnection/webapp:latest && -# docker push humanconnection/webapp:latest && -# wget https://raw.githubusercontent.com/Human-Connection/Discord-Bot/develop/tester.sh && -# chmod +x tester.sh && -# ./tester.sh nitro-staging $WEBHOOK_URL; -# fi after_failure: - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh