Skip to content
This repository was archived by the owner on Oct 1, 2020. It is now read-only.

Commit cd41401

Browse files
committed
Composer parallel install #96
1 parent bce81e7 commit cd41401

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ install:
2525
# Download kubectl, which is a requirement for using minikube. Had to install kubeadm on local VM https://kubernetes.io/docs/setup/independent/install-kubeadm/
2626
- curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/v1.14.2/bin/linux/amd64/kubectl && chmod +x kubectl && sudo mv kubectl /usr/local/bin/
2727
# Download Minikube.
28-
- curl -Lo minikube https://storage.googleapis.com/minikube/releases/v1.1.1/minikube-linux-amd64 && chmod +x minikube && sudo mv minikube /usr/local/bin/
28+
- curl -Lo minikube https://storage.googleapis.com/minikube/releases/v1.3.1/minikube-linux-amd64 && chmod +x minikube && sudo mv minikube /usr/local/bin/
2929
# Download Helm
3030
- curl https://raw.githubusercontent.com/helm/helm/master/scripts/get > get_helm.sh && chmod +x get_helm.sh && sudo ${TRAVIS_BUILD_DIR}/get_helm.sh
3131
# Socat is required fo proper Helm operation

init_project.sh

+3
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,9 @@ fi
144144
# Iterate over all requested instances and initialize them
145145
for instance_name in ${instance_names}; do
146146
setContext ${instance_name}
147+
148+
bash "${devbox_dir}/scripts/host/m_composer.sh" global require "hirak/prestissimo"
149+
147150
flags=""
148151
if [[ ${force_instance_cleaning} -eq 1 ]]; then
149152
flags="${flags}i"

scripts/guest/composer.sh

-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ incrementNestingLevel
1111

1212
composer_auth_json="${devbox_dir}/etc/composer/auth.json"
1313

14-
# commented out due to composer conflicts
15-
# ${php_executable} "${composer_phar}" global require "hirak/prestissimo:^0.3"
16-
1714
if [[ -f ${composer_auth_json} ]]; then
1815
status "Exporting etc/auth.json to environment variable"
1916
export COMPOSER_AUTH="$(cat "${composer_auth_json}")"

0 commit comments

Comments
 (0)