From e05f06f4808791232f41f8e8b7d57e53906c8bee Mon Sep 17 00:00:00 2001 From: vladikoff Date: Thu, 19 Jun 2014 14:23:05 -0700 Subject: [PATCH] chore(build): Freight dependencies --- packages/fxa-content-server/.travis.yml | 10 +++++++--- packages/fxa-content-server/CONTRIBUTING.md | 5 +++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/packages/fxa-content-server/.travis.yml b/packages/fxa-content-server/.travis.yml index dc606c25c6..892d868228 100644 --- a/packages/fxa-content-server/.travis.yml +++ b/packages/fxa-content-server/.travis.yml @@ -17,6 +17,8 @@ before_install: - "sh -e /etc/init.d/xvfb start" - wget http://selenium-release.storage.googleapis.com/2.41/selenium-server-standalone-2.41.0.jar - java -jar selenium-server-standalone-2.41.0.jar &> /dev/null & + - export FREIGHT_URL=https://freight.dev.lcip.org + - npm install -g vladikoff/freight#v0.3.0 && freight install: # install everything for full dev in the fxa-content-server. @@ -25,12 +27,14 @@ install: - cp server/config/local.json-dist server/config/local.json - grunt l10n-create-json # install the resources necessary for the auth server. - - npm install --silent git://github.com/mozilla/fxa-auth-server.git - - cd node_modules/fxa-auth-server + - git clone git://github.com/mozilla/fxa-auth-server.git --depth 1 + - cd fxa-auth-server + - freight + - npm install --silent - node ./scripts/gen_keys.js - LOG_LEVEL=error npm start & - sleep 10 - - cd ../.. + - cd .. - npm start & # now run the tests! script: diff --git a/packages/fxa-content-server/CONTRIBUTING.md b/packages/fxa-content-server/CONTRIBUTING.md index 2f24463dce..1dca9bc316 100644 --- a/packages/fxa-content-server/CONTRIBUTING.md +++ b/packages/fxa-content-server/CONTRIBUTING.md @@ -55,6 +55,11 @@ reference GitHub issues that this commit **Closes**. - **stage** - https://accounts.stage.mozaws.net/ - **production** - https://accounts.firefox.com/ +## Dependency Servers + +We use [Freight](https://github.com/vladikoff/freight) to package our npm and Bower dependencies. +Check Freight status at [freight.dev.lcip.org](https://freight.dev.lcip.org/). + ## License MPL 2.0