Makefile: Check that $BUILDSYS_ARCH is a supported architecture #1167
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
zmrow
force-pushed
the
makefile-arch-check
branch
from
ec2ba73
to
d93b7bc
Compare
|
^ Fixed a typo |
tjkirch
approved these changes
Oct 16, 2020
zmrow
force-pushed
the
makefile-arch-check
branch
from
d93b7bc
to
56b1d2b
Compare
|
^ style points |
|
Exciting, thank-you! ❤️ |
tjkirch
previously approved these changes
Oct 16, 2020
bcressey
reviewed
Oct 16, 2020
$BUILDSYS_ARCH is used all over the place in the Makefile, and if we don't check that it's a valid supported architecture first, directories get created and commands further down the line will fail. This change checks $BUILDSYS_ARCH first before anything happens and fails. It doesn't use any parameter expansion like the previous check did, meaning it will be compatible with all versions of bash.
When building AMIs, we need to canonicalize architectures to something that EC2 understands. This change uses an existing function to canonicalize the architecture when running `pubsys ami`.
zmrow
force-pushed
the
makefile-arch-check
branch
from
56b1d2b
to
d10a09c
Compare
|
Fixes @bcressey 's concern - when we wrote the SSM publishing code we added a function to canonicalize architecture but hadn't gone back to add it to the AMI code. |
bcressey
approved these changes
Oct 20, 2020
webern
approved these changes
Oct 20, 2020
tjkirch
approved these changes
Oct 21, 2020
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.
Issue number:
Related to #1162
Description of changes:
Testing done:
cargo makecommands fail if an invalid arch is supplied via-e BUILDSYS_ARCH=cargo makecommands with valid architectures work as expected.Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.