Don't commit composer.lock

fredemmott · fredemmott · commit 10768e5effa5 · 2019-04-22T14:56:49.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@ vendor/
 *.swp
 www.pid
 .DS_Store
+composer.lock
 
 # Elastic Beanstalk Files
 .elasticbeanstalk/*
diff --git a/.travis.sh b/.travis.sh
@@ -9,9 +9,6 @@ php --version
   cd $(mktemp -d)
   curl https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 )
-if (hhvm --version | grep -q -- -dev); then
-  rm composer.lock
-fi
 composer install
 
 hh_client
diff --git a/composer.lock b/composer.lock

Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,6 @@ php --version`
`9`	`9`	`cd $(mktemp -d)`
`10`	`10`	`curl https://getcomposer.org/installer \| php -- --install-dir=/usr/local/bin --filename=composer`
`11`	`11`	`)`
`12`		`-if (hhvm --version \| grep -q -- -dev); then`
`13`		`- rm composer.lock`
`14`		`-fi`
`15`	`12`	`composer install`
`16`	`13`
`17`	`14`	`hh_client`