Skip to content
This repository has been archived by the owner on Feb 12, 2022. It is now read-only.

Commit

Permalink
troubleshooting travis-ci
Browse files Browse the repository at this point in the history
  • Loading branch information
Christopher McCulloh committed Sep 23, 2016
1 parent e5fd371 commit 565ab99
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions grunt/config/saucelabs-qunit.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ module.exports = function (grunt) {
}

// Try ENV variables (export SAUCE_ACCESS_KEY=XXXX), if key doesn't exist, try key file
var sauceKey = process.env.SAUCE_ACCESS_KEY ? process.env.SAUCE_ACCESS_KEY : grunt.file.exists('SAUCE_API_KEY.yml') ? grunt.file.readYAML('SAUCE_API_KEY.yml') : undefined;
// var sauceKey = process.env.SAUCE_ACCESS_KEY ? process.env.SAUCE_ACCESS_KEY : grunt.file.exists('SAUCE_API_KEY.yml') ? grunt.file.readYAML('SAUCE_API_KEY.yml') : undefined;

// https://github.com/axemclion/grunt-saucelabs/issues/215
var getSaucekey = function getSaucekey () {
return sauceKey;
};
// var getSaucekey = function getSaucekey () {
// return sauceKey;
// };

return {
defaultBrowsers: {
options: {
username: '<%= sauceUser %>',
key: getSaucekey,
// username: '<%= sauceUser %>',
// key: getSaucekey,
tunnelTimeout: 45,
testInterval: 3000,
tags: [getPackage().version, '<%= sauceUser %>' + '@' + process.env.TRAVIS_BRANCH || '<%= sauceUser %>@local'],
Expand All @@ -30,8 +30,8 @@ module.exports = function (grunt) {
},
all: {
options: {
username: '<%= sauceUser %>',
key: getSaucekey,
// username: '<%= sauceUser %>',
// key: getSaucekey,
browsers: grunt.file.readYAML('sauce_browsers.yml'),
build: process.env.TRAVIS_BUILD_NUMBER || '<%= pkg.version %>',
testname: 'grunt-<%= grunt.template.today("dddd, mmmm dS, yyyy, h:MM:ss TT") %>',
Expand Down
2 changes: 1 addition & 1 deletion grunt/tasks/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module.exports = function test (grunt) {
['connect:testServer', 'jshint', 'saucelabs-qunit:defaultBrowsers']);

grunt.registerTask('travisci', 'Tests to run when in Travis CI environment',
['test', 'dist', 'browserify:commonjs', 'qunit:dist']);
['test', 'dist', 'browserify:commonjs', 'qunit:dist', 'saucelabs-qunit:defaultBrowsers']);

// if you've already accidentally added your files for commit, this will at least unstage them. If you haven't, this will wipe them out.
grunt.registerTask('resetdist', 'resets changes to dist to keep them from being checked in', function resetdist () {
Expand Down

0 comments on commit 565ab99

Please sign in to comment.