Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Milan
diaspora
Commits
5fcc239d
Commit
5fcc239d
authored
Sep 10, 2016
by
Steffen van Bergerem
Committed by
Benjamin Neff
Sep 10, 2016
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use bundler 1.12.5 on travis
closes #7084
parent
f0e70a3c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
.travis.yml
.travis.yml
+1
-1
script/ci/build.sh
script/ci/build.sh
+1
-1
No files found.
.travis.yml
View file @
5fcc239d
...
...
@@ -23,7 +23,7 @@ branches:
-
'
develop'
before_install
:
-
gem install bundler
-
gem install bundler
--version 1.12.5
-
mkdir travis-phantomjs
-
wget http://cifiles.diasporafoundation.org/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2
-
tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs
...
...
script/ci/build.sh
View file @
5fcc239d
...
...
@@ -8,6 +8,6 @@ if [ "$DB" = "mysql" ]; then
sed
-i
's/*common/*mysql/'
config/database.yml
fi
command
=
"bundle exec rake --trace ci:travis:
${
BUILD_TYPE
}
"
command
=
"bundle
_1.12.5_
exec rake --trace ci:travis:
${
BUILD_TYPE
}
"
exec
xvfb-run
--auto-servernum
--server-num
=
1
--server-args
=
"-screen 0 1280x1024x8"
$command
Milan
@tchncs
Mentioned in commit
a3fd949d
·
Nov 03, 2016
Mentioned in commit
a3fd949d
Mentioned in commit a3fd949df71ce509fb3f6dda46bc6e8979eb9b99
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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