From 6cfd811fcc99e5800c9e6207c48a91f85f699ae7 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 19 Nov 2014 15:22:45 -0800 Subject: [PATCH 1/5] enable Sauce access for Savage --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index fa20eac489..e255ad2501 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,6 +27,8 @@ env: - secure: "gqjqISbxBJK6byFbsmr1AyP1qoWH+rap06A2gI7v72+Tn2PU2nYkIMUkCvhZw6K889jv+LhQ/ybcBxDOXHpNCExCnSgB4dcnmYp+9oeNZb37jSP0rQ+Ib4OTLjzc3/FawE/fUq5kukZTC7porzc/k0qJNLAZRx3YLALmK1GIdUY=" - secure: "Gghh/e3Gsbj1+4RR9Lh2aR/xJl35HWiHqlPIeSUqE9D7uDCVTAwNce/dGL3Ew7uJPfJ6Pgr70wD3zgu3stw0Zmzayax0hiDtGwcQCxVIER08wqGANK9C2Q7PYJkNTNtiTo6ehKWbdV4Z+/U+TEYyQfpQTDbAFYk/vVpsdjp0Lmc=" - secure: "RTbRdx4G/2OTLfrZtP1VbRljxEmd6A1F3GqXboeQTldsnAlwpsES65es5CE3ub/rmixLApOY9ot7OPmNixFgC2Y8xOsV7lNCC62QVpmqQEDyGFFQKb3yO6/dmwQxdsCqGfzf9Np6Wh5V22QFvr50ZLKLd7Uhd9oXMDIk/z1MJ3o=" + - secure: "cjca/d8HlLWC3kS86028sMI+KPA5FHVl8Da4Y56NHOio1lkTu95QQYTHjxSN1x3LqgWa2m2jGXf+2ocm+SCmyurZahk0BqE22zKzBACYv+iMbcVBLQaQ84tn2yOYHbS3DL4o4FNS8prrkPFYBo9JJ4GZLIRLiQ+4zt+Lhn1TPjg=" + - secure: "MaUn2+a/iJWTXC8U+Y3Y8WaTbMMuz26QzsAJSvDHGoQD2P9PoepoBjjdElKP4XqqlYN3s2P5rclZ2kpxqChvVGJZxXLWKLTzlmc1sMjlTc4eXkWjZpbx2pjEVGGDM2ZW+0l/uIx2PX3tOlsBbw26sfkn4R89gm9r8Wnl/V03r14=" matrix: - TWBS_TEST=core - TWBS_TEST=validate-html From aaffe4b49860ed7f8084b6fd967dd0aa0099c9a3 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 19 Nov 2014 15:41:05 -0800 Subject: [PATCH 2/5] skip HTML validator for Savage builds --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index e255ad2501..d12763058d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ before_install: - "export TRAVIS_COMMIT_MSG=\"$(git log --format=%B --no-merges -n 1)\"" - echo "$TRAVIS_COMMIT_MSG" | grep '\[skip validator\]'; export TWBS_DO_VALIDATOR=$?; true - echo "$TRAVIS_COMMIT_MSG" | grep '\[skip sauce\]'; export TWBS_DO_SAUCE=$?; true + - if [ "$TRAVIS_REPO_SLUG" = twbs-savage/bootstrap ]; then export TWBS_DO_VALIDATOR=0; fi install: - npm install -g grunt-cli - ./test-infra/s3_cache.py download npm-modules From db95e0bd01739fb68c9b89979c7a214ffdde587e Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 19 Nov 2014 15:43:23 -0800 Subject: [PATCH 3/5] disable core tests for Savage builds --- Gruntfile.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index 76fbbcbafa..3c5e59273a 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -394,7 +394,9 @@ module.exports = function (grunt) { // Test task. var testSubtasks = []; // Skip core tests if running a different subset of the test suite - if (runSubset('core')) { + if (runSubset('core') && + // Skip core tests if this is a Savage build + process.env.TRAVIS_REPO_SLUG !== 'twbs-savage/bootstrap') { testSubtasks = testSubtasks.concat(['dist-css', 'dist-js', 'csslint:dist', 'test-js', 'docs']); } // Skip HTML validation if running a different subset of the test suite From a1c170ed373d9076ecf76d264220a6a636239f17 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 19 Nov 2014 15:51:11 -0800 Subject: [PATCH 4/5] grant Savage access to the S3 cache --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index d12763058d..d1d9dd438d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,6 +30,9 @@ env: - secure: "RTbRdx4G/2OTLfrZtP1VbRljxEmd6A1F3GqXboeQTldsnAlwpsES65es5CE3ub/rmixLApOY9ot7OPmNixFgC2Y8xOsV7lNCC62QVpmqQEDyGFFQKb3yO6/dmwQxdsCqGfzf9Np6Wh5V22QFvr50ZLKLd7Uhd9oXMDIk/z1MJ3o=" - secure: "cjca/d8HlLWC3kS86028sMI+KPA5FHVl8Da4Y56NHOio1lkTu95QQYTHjxSN1x3LqgWa2m2jGXf+2ocm+SCmyurZahk0BqE22zKzBACYv+iMbcVBLQaQ84tn2yOYHbS3DL4o4FNS8prrkPFYBo9JJ4GZLIRLiQ+4zt+Lhn1TPjg=" - secure: "MaUn2+a/iJWTXC8U+Y3Y8WaTbMMuz26QzsAJSvDHGoQD2P9PoepoBjjdElKP4XqqlYN3s2P5rclZ2kpxqChvVGJZxXLWKLTzlmc1sMjlTc4eXkWjZpbx2pjEVGGDM2ZW+0l/uIx2PX3tOlsBbw26sfkn4R89gm9r8Wnl/V03r14=" + - secure: "Dv1HX5dzyTh8gA2YsLI+yWEgh9lnGKPpRDDEYYvm42fjBFziUYfcpvA9g8GXQuU9srY3mhfsZkCDHN0x5n1gliOai5TSjmd5Hh+9UyhvNWE+D8HoUpcFXWoQXvy/if2r25m+ZWi3cqgXkkBOcal3W1ePMtU4ln18NcWyIZ0tEFo=" + - secure: "PabpUdG2dE40hHUkMCdxk1e9Ak3BOo0h7Y5/uekosLKOz5N60Xmn/ooyrSkvicLthXO4cfONFhO3/xSVRKQOxlUw4on5i0VuNK+QSqxJk0IDaRSZnTCcC8J7083K0YL+FvMdGQwcYwMY9LiwS8aS014IRkSQjsa+mjo3owP+dOU=" + - secure: "G4/f4PVyVi9o6UbZMqw9YFmDu7cHqe9iymiXYd1RcnPXwhWAePX12m0PWMhUj5itJ180PTEddVip8PNOgBdqyrDxEPKkcgAW2EElVAPIKJXVfvDW64UjQ0H7NS7XvF7iLQUJp/XfmR7NJ7tT393AQdh8SGmuQpJhgYbwIWbES/k=" matrix: - TWBS_TEST=core - TWBS_TEST=validate-html From 6575755dc49d9516840c0a0804185931f2edf9c7 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 19 Nov 2014 15:44:43 -0800 Subject: [PATCH 5/5] Savage builds should not update the S3 cache --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d1d9dd438d..091e72db74 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,8 +17,8 @@ install: - ./test-infra/s3_cache.py download npm-modules - if [ "$TWBS_TEST" = validate-html ] && [ $TWBS_DO_VALIDATOR -ne 0 ]; then ./test-infra/s3_cache.py download rubygems; fi after_script: - - if [ "$TWBS_TEST" = core ]; then ./test-infra/s3_cache.py upload npm-modules; fi - - if [ "$TWBS_TEST" = validate-html ] && [ $TWBS_DO_VALIDATOR -ne 0 ]; then ./test-infra/s3_cache.py upload rubygems; fi + - if [ "$TRAVIS_REPO_SLUG" != twbs-savage/bootstrap ] && [ "$TWBS_TEST" = core ]; then ./test-infra/s3_cache.py upload npm-modules; fi + - if [ "$TRAVIS_REPO_SLUG" != twbs-savage/bootstrap ] && [ "$TWBS_TEST" = validate-html ] && [ $TWBS_DO_VALIDATOR -ne 0 ]; then ./test-infra/s3_cache.py upload rubygems; fi env: global: - JEKYLL_VERSION="2.5.1"