Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
aa9182ca
Commit
aa9182ca
authored
10 years ago
by
Chris Rebert
Browse files
Options
Download
Email Patches
Plain Diff
properly integrate Rouge into the Travis build; fixes
#14078
[skip sauce]
parent
5d1abf8b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.travis.yml
+2
-1
.travis.yml
test-infra/S3Cachefile.json
+1
-1
test-infra/S3Cachefile.json
with
3 additions
and
2 deletions
+3
-2
.travis.yml
+
2
-
1
View file @
aa9182ca
...
@@ -5,7 +5,7 @@ before_install:
...
@@ -5,7 +5,7 @@ before_install:
-
time travis_retry sudo pip install -r test-infra/requirements.txt
-
time travis_retry sudo pip install -r test-infra/requirements.txt
-
rvm use 1.9.3 --fuzzy
-
rvm use 1.9.3 --fuzzy
-
export GEMDIR=$(rvm gemdir)
-
export GEMDIR=$(rvm gemdir)
-
if [ "$TWBS_TEST" = validate-html ]; then echo "ruby=$(basename $GEMDIR) jekyll=$JEKYLL_VERSION" > pseudo_Gemfile.lock; fi
-
if [ "$TWBS_TEST" = validate-html ]; then echo "ruby=$(basename $GEMDIR) jekyll=$JEKYLL_VERSION
rouge=$ROUGE_VERSION
" > pseudo_Gemfile.lock; fi
-
"
export
TRAVIS_COMMIT_MSG=
\"
$(git
log
--format=%B
--no-merges
-n
1)
\"
"
-
"
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 validator\]'; export TWBS_DO_VALIDATOR=$?;
true
-
echo "$TRAVIS_COMMIT_MSG" | grep '\[skip sauce\]'; export TWBS_DO_SAUCE=$?;
true
-
echo "$TRAVIS_COMMIT_MSG" | grep '\[skip sauce\]'; export TWBS_DO_SAUCE=$?;
true
...
@@ -19,6 +19,7 @@ after_script:
...
@@ -19,6 +19,7 @@ after_script:
env
:
env
:
global
:
global
:
-
JEKYLL_VERSION
:
2.1.0
-
JEKYLL_VERSION
:
2.1.0
-
ROUGE_VERSION
:
1.4.0
-
SAUCE_USERNAME
:
bootstrap
-
SAUCE_USERNAME
:
bootstrap
-
secure
:
"
pJkBwnuae9dKU5tEcCqccfS1QQw7/meEcfz63fM7ba7QJNjoA6BaXj08L5Z3Vb5vBmVPwBawxo5Hp0jC0r/Z/O0hGnAmz/Cz09L+cy7dSAZ9x4hvZePSja/UAusaB5ogMoO8l2b773MzgQeSmrLbExr9BWLeqEfjC2hFgdgHLaQ="
-
secure
:
"
pJkBwnuae9dKU5tEcCqccfS1QQw7/meEcfz63fM7ba7QJNjoA6BaXj08L5Z3Vb5vBmVPwBawxo5Hp0jC0r/Z/O0hGnAmz/Cz09L+cy7dSAZ9x4hvZePSja/UAusaB5ogMoO8l2b773MzgQeSmrLbExr9BWLeqEfjC2hFgdgHLaQ="
-
secure
:
"
gqjqISbxBJK6byFbsmr1AyP1qoWH+rap06A2gI7v72+Tn2PU2nYkIMUkCvhZw6K889jv+LhQ/ybcBxDOXHpNCExCnSgB4dcnmYp+9oeNZb37jSP0rQ+Ib4OTLjzc3/FawE/fUq5kukZTC7porzc/k0qJNLAZRx3YLALmK1GIdUY="
-
secure
:
"
gqjqISbxBJK6byFbsmr1AyP1qoWH+rap06A2gI7v72+Tn2PU2nYkIMUkCvhZw6K889jv+LhQ/ybcBxDOXHpNCExCnSgB4dcnmYp+9oeNZb37jSP0rQ+Ib4OTLjzc3/FawE/fUq5kukZTC7porzc/k0qJNLAZRx3YLALmK1GIdUY="
...
...
This diff is collapsed.
Click to expand it.
test-infra/S3Cachefile.json
+
1
-
1
View file @
aa9182ca
...
@@ -7,6 +7,6 @@
...
@@ -7,6 +7,6 @@
"rubygems"
:
{
"rubygems"
:
{
"key"
:
"../pseudo_Gemfile.lock"
,
"key"
:
"../pseudo_Gemfile.lock"
,
"cache"
:
"$GEMDIR"
,
"cache"
:
"$GEMDIR"
,
"generate"
:
"gem install -N jekyll -v $JEKYLL_VERSION"
"generate"
:
"gem install -N jekyll -v $JEKYLL_VERSION
&& gem install -N rouge -v $ROUGE_VERSION
"
}
}
}
}
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment