Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: Vagrantfile

Issue 29448564: Issue 5277 - Prepare Vagrant files for CI (Closed)
Patch Set: see the changes in commit message https://github.com/4ntoine/libadblockplus-android-ci/commit/d44b6f71a6efb02d46fb594e823c6e810ba79a4f Created May 25, 2017, 1:50 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « README.md ('k') | add-disk.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Vagrantfile
diff --git a/Vagrantfile b/Vagrantfile
index f9cf136d65fcc667095579ccefa05f89f3906314..a72a05b78222756ce80bc03f70fde78cc3f6e1ed 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -13,7 +13,8 @@ Vagrant.configure(VAGRANT_API_VERSION) do |config|
command.inline = <<-eof
export ANDROID_HOME="/home/vagrant/android-sdk-linux"
set -e
- mkdir -p build && cd build
+ rm -rf ./build/src
+ mkdir -p ./build/src && cd ./build/src
# BEG: WIP and temporary sync step
cp -rf /vagrant/. .
rm -fv `find . -name local.properties`
@@ -22,8 +23,7 @@ Vagrant.configure(VAGRANT_API_VERSION) do |config|
cd libadblockplus-android
echo "sdk.dir = /home/vagrant/android-sdk-linux" > local.properties
echo "ndk.dir = /home/vagrant/android-ndk-linux" >> local.properties
- cp local.properties ../libadblockplus-android-tests
- mvn clean install
+ ./gradlew assemble
eof
end
@@ -34,7 +34,13 @@ Vagrant.configure(VAGRANT_API_VERSION) do |config|
end
- config.vm.define "debian-jessie-amd64" do |config|
+ config.vm.provider "virtualbox" do |v|
+
+ v.memory = 2048 # 2Gb (for android emulator mostly)
+
+ end
+
+ config.vm.define "libadblockplus-android-ci-vm" do |config|
config.vm.box = "debian/contrib-jessie64"
config.vm.box_url = "https://atlas.hashicorp.com/debian/boxes/contrib-jessie64"
« no previous file with comments | « README.md ('k') | add-disk.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld