diff --git a/.travis.yml b/.travis.yml index 2511acaec4..c7a67ed9be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,4 +24,10 @@ before_script: - git config --global user.name "CamperBot" script: +<<<<<<< HEAD - npm run test-ci +======= + - npm run test + - cd ./client + - npm run build +>>>>>>> fix(ci-build): Make it so, Travis diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 5c03e59cc6..0000000000 --- a/appveyor.yml +++ /dev/null @@ -1,32 +0,0 @@ -platform: x64 -image: ubuntu - -environment: - nodejs_version: "8" - -skip_branch_with_pr: false - -skip_commits: - files: - - .github/** - - api-server/** - - curriculum/** - - docs/** - - news/** - - public/** - - seed/** - - tools/** - - "./*.md" - -# Install scripts. (runs after repo cloning) -install: - - sh: nvm install $nodejs_version - - node --version - - npm install - - npm test - -build_script: - - cd client - - npm run build - -deploy: off