From f948fb8b3e7bf1314ca5b5d088d0719b4d8e5776 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sun, 3 Jun 2018 12:15:11 -0700 Subject: [PATCH 1/3] Storage auth only occurs on non pull requests. adding brewfile to simplify mac development --- .travis.yml | 10 +++++----- README-mac.md | 10 ++-------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index bea4c6a1e..c42fa5733 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,11 +57,11 @@ notifications: slack: secure: FiVlFhSw5xnDu1Cx2yAo3J7miFCSRyuzR/2+8LKFjdWl5+fyIGvQ9x5vgUg6dWbv3UP9iIMqQuWfotsg8H+NE8pYRZQ0zDVxZ5h9+PA028qGb3OF4TMFNcltP5DGtAZ6AqrMNRZ4ltatPUm5H9ig1bhzjsx+3pqlqQuVXTXPjaUryB5s/fk2CjrsV6zTLfPHiI30jeMjmQrJJLik1vSWF70sB6HkQhvaT6jymkO4Vuh+cja418W1xIgkkoRsOXiZ/JK4hIypFo/sBkmIOprGqoFUahFqJlsBoSrp9iAzkwbDItIqqvNCHTEeN7lj6kK43ZK72E4etjjNc0CXWeleXBJBCj5Prq2lEkQ4NwuDTos3KLyyr2vI7f54xhb5+wjzY9dByHXGuG5UaNz0+uukuJinAdazGaNmmfesv1wg9p3jGa/TLsfHLMcUti875DzkUHnenivP5cXrc6/uuZyyQNq5+Gn/3DA8k0y7d1e23nm3nDjCNfATAn3yu1jieYY2yYI6CYGEXcD+UbP61uG6no+mm/lkQbQosyDfE0sADqGryqXswRste+R0sSVMBQtTipAZOUoYNbEmhN4+L78SSp3zpmgkrIxAw7le8oj6Evp2ofvE2Kvh+Z0MVoEJx6mtZI6hheIFSS38NeUZr/HBfRSpaElOYTN/ZNf8QwThCWo= before_install: -- openssl aes-256-cbc -K $encrypted_11153c0bb86c_key -iv $encrypted_11153c0bb86c_iv - -in AUTH_KEY.json.enc -out AUTH_KEY.json -d +- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then openssl aes-256-cbc -K $encrypted_11153c0bb86c_key -iv $encrypted_11153c0bb86c_iv + -in AUTH_KEY.json.enc -out AUTH_KEY.json -d; fi - if [ ! -d "$HOME/google-cloud-sdk/bin" ]; then rm -rf $HOME/google-cloud-sdk; export CLOUDSDK_CORE_DISABLE_PROMPTS=1; curl https://sdk.cloud.google.com | bash; fi - source /home/travis/google-cloud-sdk/path.bash.inc -- gcloud auth activate-service-account --key-file AUTH_KEY.json -- rm AUTH_KEY.json && rm AUTH_KEY.json.enc - +- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then - gcloud auth activate-service-account --key-file AUTH_KEY.json +- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then rm AUTH_KEY.json; fi +- rm AUTH_KEY.json.enc diff --git a/README-mac.md b/README-mac.md index c085cb617..a7748d81c 100644 --- a/README-mac.md +++ b/README-mac.md @@ -6,16 +6,10 @@ And Homebrew: http://brew.sh/ -And this is the list of brew packages you'll need installed: +then use the brewfile to install the necessary packages: ```shell -brew tap discoteq/discoteq; brew install flock -brew install autoconf autogen automake -brew tap homebrew/versions; brew install homebrew/versions/gcc5 -brew install binutils -brew install protobuf -brew install coreutils -brew install wget +brew bundle ``` Get all that installed, then run: From 41148a356d9aefcdadc587515a60143938d37ce3 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sun, 3 Jun 2018 12:19:07 -0700 Subject: [PATCH 2/3] Storage auth only occurs on non pull requests. adding brewfile to simplify mac development --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c42fa5733..6899e9192 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,6 +62,6 @@ before_install: - if [ ! -d "$HOME/google-cloud-sdk/bin" ]; then rm -rf $HOME/google-cloud-sdk; export CLOUDSDK_CORE_DISABLE_PROMPTS=1; curl https://sdk.cloud.google.com | bash; fi - source /home/travis/google-cloud-sdk/path.bash.inc -- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then - gcloud auth activate-service-account --key-file AUTH_KEY.json +- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then - gcloud auth activate-service-account --key-file AUTH_KEY.json; fi - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then rm AUTH_KEY.json; fi - rm AUTH_KEY.json.enc From 5efe81bdddf0832de629f9f647220405bbc96fd4 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sun, 3 Jun 2018 12:21:49 -0700 Subject: [PATCH 3/3] fixed typo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6899e9192..077a3e82c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,6 +62,6 @@ before_install: - if [ ! -d "$HOME/google-cloud-sdk/bin" ]; then rm -rf $HOME/google-cloud-sdk; export CLOUDSDK_CORE_DISABLE_PROMPTS=1; curl https://sdk.cloud.google.com | bash; fi - source /home/travis/google-cloud-sdk/path.bash.inc -- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then - gcloud auth activate-service-account --key-file AUTH_KEY.json; fi +- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gcloud auth activate-service-account --key-file AUTH_KEY.json; fi - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then rm AUTH_KEY.json; fi - rm AUTH_KEY.json.enc