search

guardian / homebrew-devtools

A homebrew tap containing dev tools for the Guardian
2 stars 3 forks source link

bump dev-nginx to 1.5.0 #88

Closed joelochlann closed 1 year ago

joelochlann commented 1 year ago

As per https://github.com/guardian/dev-nginx/releases/tag/v1.5.0

see also guardian/dev-nginx#28

joelochlann commented 1 year ago

I'm not sure what's up with the build. It seems to be choking on some git conflict lines but I can't see any in the code...

akash1810 commented 1 year ago

I'm not sure what's up with the build. It seems to be choking on some git conflict lines but I can't see any in the code...

@shtukas and @jonathonherbert have been looking at this as part of #84. Worth sharing notes?

shtukas commented 1 year ago

Ah.... Interesting. Yes we ( @jonathonherbert and myself ) had a problem with ( https://github.com/guardian/homebrew-devtools/pull/84 ), but the successful test at ( https://github.com/guardian/homebrew-devtools/pull/87 ), shows that it's not on every branch 🤔

@joelochlann @akash1810

shtukas commented 1 year ago

The only idea I have right now, and that might just be stupid, but I would make a PR from a freshly cloned repository. Might be worth a try.

@joelochlann @jonathonherbert @akash1810

akash1810 commented 1 year ago

Our CI script currently uses macos-latest.

In January, macos-latest was moved to macos-12. This uses homebrew 4.0.6.

Looking at this comment, it looks like CI was added to this repository assuming macos-10.15, which comes with homebrew 3.6.6.

That is, we're using a new major version of homebrew. Maybe worth pinning our CI to macos-10.15, and creating an issue to move to macos-latest at a later time? Though I'm not sure why #87 is happily passing the build.

joelochlann commented 1 year ago

Setting macos-10.15 didn't work, nor did trying a fresh clone of the repo

shtukas commented 1 year ago

There is a difference between your attempt and mine. I have an extra line, which seems to make a difference: https://github.com/guardian/homebrew-devtools/pull/90/files#diff-944291df2c9c06359d37cc8833d182d705c9e8c3108e7cfe132d61a06e9133ddR19

akash1810 commented 1 year ago

https://github.com/guardian/homebrew-devtools/pull/93 offers a fix - the exact cause remains somewhat unknown, but at least the build passes.

akash1810 commented 1 year ago

94 has been merged now. A rebase of main should get the build in this PR passing 🤞🏽.

joelochlann commented 1 year ago

Thanks @akash1810!

joelochlann commented 1 year ago

Build looks good! ✅

Are you able to give a 👍 @akash1810?