Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build all architectures for calicoctl #2313

Merged
merged 2 commits into from
Apr 21, 2021

Conversation

mgleung
Copy link
Contributor

@mgleung mgleung commented Apr 20, 2021

Description

Ensures that all of the architectures that we support are built and uploaded on each release for the calicoctl utility. Fixes https://github.com/projectcalico/calicoctl/issues/2269

Todos

  • Tests
  • Documentation
  • Release note

Release Note

None required

Brian-McM
Brian-McM previously approved these changes Apr 21, 2021
Makefile Outdated Show resolved Hide resolved
Copy link
Contributor

@Brian-McM Brian-McM left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please move VALIDARCHES above the include for the common makefile

@Brian-McM
Copy link
Contributor

So my other comment is slightly wrong, what you need to do is set EXCLUDEARCH to empty before the common makefile include:

ARCHES ?= $(patsubst docker-image/Dockerfile.%,%,$(wildcard docker-image/Dockerfile.*))

# Some repositories keep their Dockerfile(s) in the root directory instead of in
# the 'docker-image' subdir. Make sure ARCHES gets filled in either way.
ifeq ($(ARCHES),)
    ARCHES=$(patsubst Dockerfile.%,%,$(wildcard Dockerfile.*))
endif

# list of arches *not* to build when doing *-all
#    until s390x works correctly
EXCLUDEARCH ?= s390x
VALIDARCHES = $(filter-out $(EXCLUDEARCH),$(ARCHES))

^^ that's in the common Makefile. The "sub" targets that are created on the include require the VALIDARCHES be set before the include.

@mgleung mgleung merged commit aa9a3fd into projectcalico:master Apr 21, 2021
@mgleung mgleung deleted the build-all-arches branch April 21, 2021 21:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

s390x calicoctl-linux binary
4 participants