From cd1b45311020f54048eb52f3366dda952908f9eb Mon Sep 17 00:00:00 2001 From: Chelsea Holland Komlo Date: Tue, 31 Jul 2018 15:25:48 -0400 Subject: [PATCH 1/3] bootstrap vagrant development environment with protoc --- Vagrantfile | 4 ++++ scripts/vagrant-linux-protoc.sh | 8 ++++++++ 2 files changed, 12 insertions(+) create mode 100755 scripts/vagrant-linux-protoc.sh diff --git a/Vagrantfile b/Vagrantfile index 36a44e44f..b3b9a1125 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -136,6 +136,10 @@ def configureLinuxProvisioners(vmCfg) privileged: true, path: './scripts/vagrant-linux-priv-rkt.sh' + vmCfg.vm.provision "shell", + privileged: true, + path: './scripts/vagrant-linux-protoc.sh' + vmCfg.vm.provision "shell", privileged: false, path: './scripts/vagrant-linux-priv-ui.sh' diff --git a/scripts/vagrant-linux-protoc.sh b/scripts/vagrant-linux-protoc.sh new file mode 100755 index 000000000..dc04c3583 --- /dev/null +++ b/scripts/vagrant-linux-protoc.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +# set up protoc so that we can use it for protobuf generation +PROTOC_ZIP=protoc-3.3.0-osx-x86_64.zip +curl -OL https://github.com/google/protobuf/releases/download/v3.3.0/$PROTOC_ZIP +sudo unzip -o $PROTOC_ZIP -d /usr/local bin/protoc +rm -f $PROTOC_ZIP + From 73c95603148ef79bf02a220a54e06363874c576b Mon Sep 17 00:00:00 2001 From: Chelsea Holland Komlo Date: Tue, 31 Jul 2018 15:44:02 -0400 Subject: [PATCH 2/3] correct operating system --- scripts/vagrant-linux-protoc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/vagrant-linux-protoc.sh b/scripts/vagrant-linux-protoc.sh index dc04c3583..36b0a0498 100755 --- a/scripts/vagrant-linux-protoc.sh +++ b/scripts/vagrant-linux-protoc.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # set up protoc so that we can use it for protobuf generation -PROTOC_ZIP=protoc-3.3.0-osx-x86_64.zip +PROTOC_ZIP=protoc-3.3.0-linux-x86_64.zip curl -OL https://github.com/google/protobuf/releases/download/v3.3.0/$PROTOC_ZIP sudo unzip -o $PROTOC_ZIP -d /usr/local bin/protoc rm -f $PROTOC_ZIP From 06c79ee32055c5875e67e4dec90f1a20ec618beb Mon Sep 17 00:00:00 2001 From: Chelsea Holland Komlo Date: Wed, 1 Aug 2018 10:52:50 -0400 Subject: [PATCH 3/3] update to latest protoc version --- scripts/vagrant-linux-protoc.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/vagrant-linux-protoc.sh b/scripts/vagrant-linux-protoc.sh index 36b0a0498..7d0a52249 100755 --- a/scripts/vagrant-linux-protoc.sh +++ b/scripts/vagrant-linux-protoc.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash # set up protoc so that we can use it for protobuf generation -PROTOC_ZIP=protoc-3.3.0-linux-x86_64.zip -curl -OL https://github.com/google/protobuf/releases/download/v3.3.0/$PROTOC_ZIP +PROTOC_ZIP=protoc-3.6.1-linux-x86_64.zip +curl -OL https://github.com/google/protobuf/releases/download/v3.6.1/$PROTOC_ZIP sudo unzip -o $PROTOC_ZIP -d /usr/local bin/protoc rm -f $PROTOC_ZIP