bump dev-nginx to 1.5.0 #88
Conversation
|
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? |
|
Ah.... Interesting. Yes we ( @jonathonherbert and myself ) had a problem with ( #84 ), but the successful test at ( #87 ), shows that it's not on every branch 🤔 |
|
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. |
|
Our CI script currently uses In January, 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 |
|
Setting |
|
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 |
The build log of #88 contains: ```log error: could not apply 1728e63... Merge 0da6e2d into 02dd552 hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 1728e63... Merge 0da6e2d into 02dd552 ``` Unsure why, let's perform `git status` to narrow the cause down.
|
#93 offers a fix - the exact cause remains somewhat unknown, but at least the build passes. |
The builds in #84 and #88 are failing with messages that suggest a git conflict: ```log Error: guardian/devtools/ssm: /usr/local/Homebrew/Library/Taps/guardian/homebrew-devtools/Formula/ssm.rb:4: syntax error, unexpected <<, expecting end <<<<<<< HEAD ^~ /usr/local/Homebrew/Library/Taps/guardian/homebrew-devtools/Formula/ssm.rb:8: syntax error, unexpected ===, expecting end ======= ^~~ /usr/local/Homebrew/Library/Taps/guardian/homebrew-devtools/Formula/ssm.rb:12: syntax error, unexpected >>, expecting end >>>>>>> c7fbe61 (Merge dac26ab... ^~ /usr/local/Homebrew/Library/Taps/guardian/homebrew-devtools/Formula/ssm.rb:12: syntax error, unexpected tIDENTIFIER, expecting ')' ...ec66d58337ac276f718186ac0c8a059) ...^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ``` Indeed, this is confirmed via #92, which demonstrates that somewhere in the build homebrew is making changes to the checked out code in a way that causes git conflicts. This results in the above error message being witnessed when we attempt to install from the checked out code. In this change, we split the CI steps up, changing the ordering. Before 1. Checkout branch 2. Apply AWS CLI work-around 3. Update homebrew 4. Install from local file system After 1. Apply AWS CLI work-around 2. Update homebrew 3. Checkout branch 4. Install from local file system This should guarantee that homebrew does not mutate the checked out branch, and therefore make the build more deterministic, and stable.
The builds in #84 and #88 are failing with messages that suggest a git conflict: ```log Error: guardian/devtools/ssm: /usr/local/Homebrew/Library/Taps/guardian/homebrew-devtools/Formula/ssm.rb:4: syntax error, unexpected <<, expecting end <<<<<<< HEAD ^~ /usr/local/Homebrew/Library/Taps/guardian/homebrew-devtools/Formula/ssm.rb:8: syntax error, unexpected ===, expecting end ======= ^~~ /usr/local/Homebrew/Library/Taps/guardian/homebrew-devtools/Formula/ssm.rb:12: syntax error, unexpected >>, expecting end >>>>>>> c7fbe61 (Merge dac26ab... ^~ /usr/local/Homebrew/Library/Taps/guardian/homebrew-devtools/Formula/ssm.rb:12: syntax error, unexpected tIDENTIFIER, expecting ')' ...ec66d58337ac276f718186ac0c8a059) ...^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ``` Indeed, this is confirmed via #92, which demonstrates that somewhere in the build homebrew is making changes to the checked out code in a way that causes git conflicts. This results in the above error message being witnessed when we attempt to install from the checked out code. In this change, we split the CI steps up, changing the ordering. Before 1. Checkout branch 2. Apply AWS CLI work-around 3. Update homebrew 4. Install from local file system After 1. Apply AWS CLI work-around 2. Update homebrew 3. Checkout branch 4. Install from local file system This should guarantee that homebrew does not mutate the checked out branch, and therefore make the build more deterministic, and stable.
|
#94 has been merged now. A rebase of |
|
Thanks @akash1810! |
joelochlann
force-pushed
the
js-bump-to-v1.5.0
branch
from
0da6e2d to
9d02924
Compare
This reverts commit 9d02924.
|
Build looks good! ✅ Are you able to give a 👍 @akash1810? |
As per https://github.com/guardian/dev-nginx/releases/tag/v1.5.0
see also guardian/dev-nginx#28