diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 85968c945..000000000 --- a/.travis.yml +++ /dev/null @@ -1,94 +0,0 @@ -language: python - -python: 3.6 - -dist: bionic - -services: - - docker - -addons: - chrome: stable - -cache: - pip: true - npm: true - directories: - - ~/.npm - - ~/.cache - -before_install: - - | - if [ "$INSTALL_NODEJS" == "true" ]; then - nvm install lts/* - fi - - | - if [ "$INSTALL_NODE_MODULES" == "true" ]; then - npm install - fi - - | - if [ "$INSTALL_PY_MODULES" == "true" ]; then - cd server - pip install -r requirements.txt - cd .. - fi - - | - if [ "$RUN_SERVICES" == "true" ]; then - docker-compose -f .travis-docker-compose.yml up -d - sleep 30 - fi - - | - if [ "$E2E" == "true" ]; then - cd e2e/server - pip install -r requirements.txt - cd .. - fi - - | - if [ "$E2E" == "true" ]; then - npm install - fi - - | - if [ "$E2E" == "true" ]; then - npm run build - fi - - | - if [ "$E2E" == "true" ]; then - cd server - honcho start & - cd .. - fi - -jobs: - include: - - name: "server" - env: - - INSTALL_NODEJS=false - - INSTALL_NODE_MODULES=false - - INSTALL_PY_MODULES=true - - RUN_SERVICES=true - script: cd server && flake8 && nosetests --logging-level=ERROR && behave --format progress2 --logging-level=ERROR - - name: "client" - env: - - INSTALL_NODEJS=true - - INSTALL_NODE_MODULES=true - - INSTALL_PY_MODULES=false - - RUN_SERVICES=false - script: npm run test - - name: "e2e vol. 1 (events)" - env: - - INSTALL_NODEJS=true - - INSTALL_NODE_MODULES=true - - INSTALL_PY_MODULES=false - - RUN_SERVICES=true - - E2E=true - - TZ=Australia/Sydney - script: npm run cypress-ci -- --spec "cypress/integration/events/*.spec.js" - - name: "e2e vol. 2 (non-events)" - env: - - INSTALL_NODEJS=true - - INSTALL_NODE_MODULES=true - - INSTALL_PY_MODULES=false - - RUN_SERVICES=true - - E2E=true - - TZ=Australia/Sydney - script: npm run cypress-ci -- --spec "cypress/integration/!(events)/*.spec.js" diff --git a/scripts/ci-start-services.sh b/scripts/ci-start-services.sh index 913120d1d..4cf286dec 100755 --- a/scripts/ci-start-services.sh +++ b/scripts/ci-start-services.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash if [ "$RUN_SERVICES" == "true" ]; then - docker-compose -f .travis-docker-compose.yml up -d + docker compose -f .travis-docker-compose.yml up -d while ! curl -sfo /dev/null 'http://localhost:9200/'; do echo -n '.' && sleep .5; done fi