Create separate builds for CentOS7 (+fips) #9176
Merged
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
rosstimothy
reviewed
Dec 1, 2021
rosstimothy
reviewed
Dec 1, 2021
zmb3
force-pushed
the
zmb3/separate-centos7-builds
branch
5 times, most recently
from
059a13e to
1eea931
Compare
zmb3
force-pushed
the
zmb3/separate-centos7-builds
branch
from
1eea931 to
03d08c3
Compare
zmb3
commented
Dec 1, 2021
| docsbox: | ||
| if ! docker inspect --type=image $(DOCSBOX) 2>&1 >/dev/null; then docker pull $(DOCSBOX) || true; fi | ||
|
|
||
| .PHONY: test-docs | ||
| test-docs: DOCS_VERSION := $(shell grep -E ^VERSION $(MAKEFILE_ROOT_DIR)/Makefile | cut -d= -f2 | cut -d. -f1-2) |
There was a problem hiding this comment.
This has always failed and emitted a warning because MAKEFILE_ROOT_DIR was never defined:
grep: /Makefile: No such file or directory
As a result, the container would just mount src/content and run docs checks against all versions.
With this change, we get the same behavior that we've always had, without the pesky grep warning.
zmb3
force-pushed
the
zmb3/separate-centos7-builds
branch
3 times, most recently
from
0e6cc2f to
ffa69bc
Compare
xacrimon
approved these changes
Dec 1, 2021
russjones
approved these changes
Dec 1, 2021
rosstimothy
approved these changes
Dec 1, 2021
zmb3
force-pushed
the
zmb3/separate-centos7-builds
branch
6 times, most recently
from
b527d2a to
fed012a
Compare
Add new buildboxes for centos7 and centos7-fips. For now, we will continue to support both CentOS 6 and 7. Eventually we will drop support for CentOS 6, and the only supported CentOS builds will be these new CentOS 7 builds. Fixes #9028
zmb3
force-pushed
the
zmb3/separate-centos7-builds
branch
from
fed012a to
e922d0a
Compare
zmb3
force-pushed
the
zmb3/separate-centos7-builds
branch
from
e922d0a to
6d1bf45
Compare
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.
Add new buildboxes for centos7 and centos7-fips.
For now, we will continue to support both CentOS 6 and 7.
Eventually we will drop support for CentOS 6, and the only
supported CentOS builds will be these new CentOS 7 builds.
Additionally, this change makes build.assets/Makefile the
source of truth for which Go/Rust versions we use to compile,
creating a few less places that need to be manually updated
when we wish to bump versions.
Fixes #9028