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.

Sign up for GitHub

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

clean-up: sets default architecture to amd64 #3221

Merged
merged 1 commit into from
May 8, 2024
Merged

clean-up: sets default architecture to amd64 #3221

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ GIT_COMMIT := $(shell git rev-parse HEAD)
ifeq ($(shell arch), arm64)
ARCH := arm64
else
ARCH := 386
ARCH := amd64
endif
# Phony prerequisite for targets that rely on the go build cache to determine staleness.
.PHONY: build test clean vendor \
Expand Down Expand Up @@ -167,7 +167,7 @@ bin/e2e-local.test: FORCE test/e2e/assets/chart/zz_chart.go

# set go env and other vars, ensure that the dockerfile exists, and then build wait, cpb, and other command binaries and finally the kind image archive
test/e2e-local.image.tar: export GOOS=linux
test/e2e-local.image.tar: export GOARCH=386
test/e2e-local.image.tar: export GOARCH=amd64
Copy link

Choose a reason for hiding this comment

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

Hi @perdasilva any way to pass the attributes from the Makefile or set them as env vars so the e2e test doesn't need to hard-code their values?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Hey, I'm going to refactor the Makefile soon. I'm just making small changes now to make sure CI goes through. It's very finicky sometimes...

test/e2e-local.image.tar: build_cmd=build
test/e2e-local.image.tar: e2e.Dockerfile bin/wait bin/cpb $(CMDS)
docker build -t quay.io/operator-framework/olm:local -f $< bin
Expand Down
Loading