SSM v2.4.0 #84
Merged
SSM v2.4.0 #84
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
shtukas
approved these changes
Apr 3, 2023
|
There seems to be a problem with the |
jonathonherbert
force-pushed
the
jsh/ssm-2.4.0
branch
from
3e68b5d to
98084bb
Compare
This was referenced Apr 3, 2023
Merged
akash1810
reviewed
Apr 3, 2023
akash1810
added a commit
that referenced
this pull request
Apr 4, 2023
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.
akash1810
added a commit
that referenced
this pull request
Apr 4, 2023
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.
jonathonherbert
force-pushed
the
jsh/ssm-2.4.0
branch
from
2624263 to
50c8616
Compare
jonathonherbert
force-pushed
the
jsh/ssm-2.4.0
branch
from
50c8616 to
5e3b6c9
Compare
akash1810
approved these changes
Apr 4, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://github.com/guardian/ssm-scala/releases/tag/v2.4.0