* [PATCH v1] travis-ci: ask homebrew for the its path instead of hardcoding it
@ 2016-09-21 8:45 larsxschneider
2016-09-21 9:31 ` stefan.naewe
0 siblings, 1 reply; 5+ messages in thread
From: larsxschneider @ 2016-09-21 8:45 UTC (permalink / raw)
To: git; +Cc: gitster, Lars Schneider
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(-)
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
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v1] travis-ci: ask homebrew for the its path instead of hardcoding it
2016-09-21 8:45 [PATCH v1] travis-ci: ask homebrew for the its path instead of hardcoding it larsxschneider
@ 2016-09-21 9:31 ` stefan.naewe
2016-09-21 13:28 ` Lars Schneider
0 siblings, 1 reply; 5+ messages in thread
From: stefan.naewe @ 2016-09-21 9:31 UTC (permalink / raw)
To: larsxschneider, git; +Cc: gitster
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/
> 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
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v1] travis-ci: ask homebrew for the its path instead of hardcoding it
2016-09-21 9:31 ` stefan.naewe
@ 2016-09-21 13:28 ` Lars Schneider
2016-09-21 16:42 ` Junio C Hamano
0 siblings, 1 reply; 5+ messages in thread
From: Lars Schneider @ 2016-09-21 13:28 UTC (permalink / raw)
To: stefan.naewe; +Cc: git, gitster
> 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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v1] travis-ci: ask homebrew for the its path instead of hardcoding it
2016-09-21 13:28 ` Lars Schneider
@ 2016-09-21 16:42 ` Junio C Hamano
2016-09-22 9:03 ` Lars Schneider
0 siblings, 1 reply; 5+ messages in thread
From: Junio C Hamano @ 2016-09-21 16:42 UTC (permalink / raw)
To: Lars Schneider; +Cc: stefan.naewe, git
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.
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v1] travis-ci: ask homebrew for the its path instead of hardcoding it
2016-09-21 16:42 ` Junio C Hamano
@ 2016-09-22 9:03 ` Lars Schneider
0 siblings, 0 replies; 5+ messages in thread
From: Lars Schneider @ 2016-09-22 9:03 UTC (permalink / raw)
To: Junio C Hamano; +Cc: stefan.naewe, git
> 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)
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-09-22 9:03 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-21 8:45 [PATCH v1] travis-ci: ask homebrew for the its path instead of hardcoding it larsxschneider
2016-09-21 9:31 ` stefan.naewe
2016-09-21 13:28 ` Lars Schneider
2016-09-21 16:42 ` Junio C Hamano
2016-09-22 9:03 ` Lars Schneider
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).