Fix AppVeyor:

* Detect continuous integration environment via `CI` variable
* Use double quotes for build cache path
This commit is contained in:
Nicholas Dudfield
2015-03-04 10:13:43 +07:00
committed by Tom Ritchford
parent fc8bf39043
commit 2e59378ab7
4 changed files with 7 additions and 7 deletions

View File

@@ -19,7 +19,7 @@ environment:
# At the end of each successful build we cache this directory. It must be less # At the end of each successful build we cache this directory. It must be less
# than 100MB total compressed. # than 100MB total compressed.
cache: cache:
- 'C:\\rippled_deps' - "C:\\rippled_deps"
# This means we'll download a zip of the branch we want, rather than the full # This means we'll download a zip of the branch we want, rather than the full
# history. # history.

View File

@@ -8,7 +8,7 @@ var Server = require('./server').Server;
var testutils = require('./testutils'); var testutils = require('./testutils');
var config = testutils.init_config(); var config = testutils.init_config();
var make_suite = process.env.TRAVIS != null ? suite.skip : suite; var make_suite = process.env.CI ? suite.skip : suite;
make_suite('Robust transaction submission', function() { make_suite('Robust transaction submission', function() {
var $ = { }; var $ = { };
@@ -288,7 +288,7 @@ make_suite('Robust transaction submission', function() {
if (++ledgers === 3) { if (++ledgers === 3) {
callback(); callback();
} else { } else {
setTimeout(nextLedger, process.env.TRAVIS ? 400 : 100 ); setTimeout(nextLedger, process.env.CI ? 400 : 100 );
} }
}); });
$.remote.ledger_accept(); $.remote.ledger_accept();

View File

@@ -616,13 +616,13 @@ function verify_owner_counts(remote, counts, callback) {
async.every(tests, iterator, callback); async.every(tests, iterator, callback);
}; };
var isTravis = Boolean(process.env.TRAVIS); var isCI = Boolean(process.env.CI);
function ledger_wait(remote, tx) { function ledger_wait(remote, tx) {
;(function nextLedger() { ;(function nextLedger() {
remote.once('ledger_closed', function() { remote.once('ledger_closed', function() {
if (!tx.finalized) { if (!tx.finalized) {
setTimeout(nextLedger, isTravis ? 400 : 100); setTimeout(nextLedger, isCI ? 400 : 100);
} }
}); });
remote.ledger_accept(); remote.ledger_accept();

View File

@@ -9,8 +9,8 @@ var config = testutils.init_config();
/* --------------------------------- CONSTS --------------------------------- */ /* --------------------------------- CONSTS --------------------------------- */
// some parts of the test take a LONG time // some parts of the test take a LONG time
var SKIP_TICKET_EXPIRY_PHASE = process.env.TRAVIS == null && var SKIP_TICKET_EXPIRY_PHASE = !process.env.CI &&
process.env.RUN_TICKET_EXPIRY == null; !process.env.RUN_TICKET_EXPIRY;
var ROOT_ACCOUNT = UInt160.json_rewrite('root'); var ROOT_ACCOUNT = UInt160.json_rewrite('root');
var ALICE_ACCOUNT = UInt160.json_rewrite('alice'); var ALICE_ACCOUNT = UInt160.json_rewrite('alice');