threads / patch / 44123

patchtravis-ci: ask homebrew for the its path instead of hardcoding it

Subject: [PATCH v1] travis-ci: ask homebrew for the its path instead of hardcoding it

## tl;dr

5 messages between Sep 21, 2016 and Sep 22, 2016. Diffs are folded; open one to read it.

replies: 4people: 3as markdown or json

larsxschneider@gmail.com· Sep 21, 2016, 08:45 UTC · lore
From: Lars Schneider <larsxschneider@gmail.com>

The TravisCI macOS build is broken because homebrew (a macOS depedency manager) changed its internal directory structure [1]. This is a problem because we modify the Perforce dependencies in the homebrew repository before installing them.

Fix it by asking homebrew for its path instead of hardcoding it.
[1] https://github.com/Homebrew/brew/commit/0a09ae30f8b6117ad699b4a0439010738989c547
Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
---
Hi Junio,

the problem affects all branches (pu, next, master, maint): https://travis-ci.org/git/git/branches

Is it possible for this fix to graduate more quickly?

Thanks, Lars

 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Show changes to .travis.yml +1 −2
diff --git a/.travis.yml b/.travis.yml
index 477c3d2..37a1e1f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -78,7 +78,7 @@ before_install:
         FORMULA=$1
         SHA=$(brew fetch --force $FORMULA 2>&1 | grep ^SHA256: | cut -d ' ' -f 2)
         sed -E -i.bak "s/sha256 \"[0-9a-f]{64}\"/sha256 \"$SHA\"/g" \
-          /usr/local/Library/Taps/homebrew/homebrew-binary/$FORMULA.rb
+          "$(brew --repository homebrew/homebrew-binary)/$FORMULA.rb"
       }
       brew update --quiet
       brew tap homebrew/binary --quiet
--
2.10.0
stefan.naewe@atlas-elektronik.com· Sep 21, 2016, 09:31 UTC · re: larsxschneider@gmail.com · lore

Re: [PATCH v1] travis-ci: ask homebrew for the its path instead of hardcoding it

In the Subject: s/the //
Am 21.09.2016 um 10:45 schrieb larsxschneider@gmail.com:
> From: Lars Schneider <larsxschneider@gmail.com>
> 
> The TravisCI macOS build is broken because homebrew (a macOS depedency
s/depedency/dependency/
Show 41 quoted lines
> manager) changed its internal directory structure [1]. This is a problem
> because we modify the Perforce dependencies in the homebrew repository
> before installing them.
> 
> Fix it by asking homebrew for its path instead of hardcoding it.
> 
> [1] https://github.com/Homebrew/brew/commit/0a09ae30f8b6117ad699b4a0439010738989c547
> 
> Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
> ---
> 
> Hi Junio,
> 
> the problem affects all branches (pu, next, master, maint):
> https://travis-ci.org/git/git/branches
> 
> Is it possible for this fix to graduate more quickly?
> 
> Thanks,
> Lars
> 
>  .travis.yml | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/.travis.yml b/.travis.yml
> index 477c3d2..37a1e1f 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -78,7 +78,7 @@ before_install:
>          FORMULA=$1
>          SHA=$(brew fetch --force $FORMULA 2>&1 | grep ^SHA256: | cut -d ' ' -f 2)
>          sed -E -i.bak "s/sha256 \"[0-9a-f]{64}\"/sha256 \"$SHA\"/g" \
> -          /usr/local/Library/Taps/homebrew/homebrew-binary/$FORMULA.rb
> +          "$(brew --repository homebrew/homebrew-binary)/$FORMULA.rb"
>        }
>        brew update --quiet
>        brew tap homebrew/binary --quiet
> --
> 2.10.0
> 
> 
-- 
----------------------------------------------------------------
/dev/random says: If winning isn't important then why keep score?
python -c "print '73746566616e2e6e616577654061746c61732d656c656b74726f6e696b2e636f6d'.decode('hex')" 
GPG Key fingerprint = 2DF5 E01B 09C3 7501 BCA9  9666 829B 49C5 9221 27AF
Lars Schneider· Sep 21, 2016, 13:28 UTC · re: stefan.naewe@atlas-elektronik.com · lore

Re: [PATCH v1] travis-ci: ask homebrew for the its path instead of hardcoding it

Show 10 quoted lines
> On 21 Sep 2016, at 11:31, stefan.naewe@atlas-elektronik.com wrote:
> 
> In the Subject: s/the //
> 
> Am 21.09.2016 um 10:45 schrieb larsxschneider@gmail.com:
>> From: Lars Schneider <larsxschneider@gmail.com>
>> 
>> The TravisCI macOS build is broken because homebrew (a macOS depedency
> 
> s/depedency/dependency/
Thanks for spotting both errors!
@Junio: Should I make a v2?

Thanks, Lars

Junio C Hamano· Sep 21, 2016, 16:42 UTC · re: Lars Schneider · lore

Re: [PATCH v1] travis-ci: ask homebrew for the its path instead of hardcoding it

Lars Schneider <larsxschneider@gmail.com> writes:
Show 14 quoted lines
>> On 21 Sep 2016, at 11:31, stefan.naewe@atlas-elektronik.com wrote:
>> 
>> In the Subject: s/the //
>> 
>> Am 21.09.2016 um 10:45 schrieb larsxschneider@gmail.com:
>>> From: Lars Schneider <larsxschneider@gmail.com>
>>> 
>>> The TravisCI macOS build is broken because homebrew (a macOS depedency
>> 
>> s/depedency/dependency/
>
> Thanks for spotting both errors!
>
> @Junio: Should I make a v2?

No. osx before_install stuff was in there since the very beginning, i.e. 522354d7 ("Add Travis CI support", 2015-11-27), so I guess this needs to go to maint-2.7 and upwards, but I guess we should discourage people to stay on an older maintenance track forever, so let's do this only for 'maint' and upwards.

Lars Schneider· Sep 22, 2016, 09:03 UTC · re: Junio C Hamano · lore

Re: [PATCH v1] travis-ci: ask homebrew for the its path instead of hardcoding it

Show 24 quoted lines
> On 21 Sep 2016, at 18:42, Junio C Hamano <gitster@pobox.com> wrote:
> 
> Lars Schneider <larsxschneider@gmail.com> writes:
> 
>>> On 21 Sep 2016, at 11:31, stefan.naewe@atlas-elektronik.com wrote:
>>> 
>>> In the Subject: s/the //
>>> 
>>> Am 21.09.2016 um 10:45 schrieb larsxschneider@gmail.com:
>>>> From: Lars Schneider <larsxschneider@gmail.com>
>>>> 
>>>> The TravisCI macOS build is broken because homebrew (a macOS depedency
>>> 
>>> s/depedency/dependency/
>> 
>> Thanks for spotting both errors!
>> 
>> @Junio: Should I make a v2?
> 
> No.  osx before_install stuff was in there since the very beginning,
> i.e. 522354d7 ("Add Travis CI support", 2015-11-27), so I guess this
> needs to go to maint-2.7 and upwards, but I guess we should discourage
> people to stay on an older maintenance track forever, so let's do
> this only for 'maint' and upwards.
Sound good to me.

Thank you, Lars

Minor nit: If still possible and no trouble for you please do `s/the //` on the subject line of 72fa5cd29f2a9249462215109dbf41b4a6c0c768 (in PU)

← back to recent threads