Fix cross-platform build for simple-game-server #2613
Conversation
Fixes: * Run `go mod tidy` otherwise failure to compile * Fix building on amd64 * Fix target for building manifest appropriately. Work on googleforgames#2216
markmandel
added
kind/bug
|
Build Succeeded 👏 Build Id: 87060f55-ee83-4470-b39b-e7a87e2219c3 The following development artifacts have been built, and will exist for the next 30 days:
A preview of the website (the last 30 builds are retained): To install this version:
|
|
Build Succeeded 👏 Build Id: 90f0cd2e-25ac-4dc1-9be7-96c958054b43 The following development artifacts have been built, and will exist for the next 30 days:
A preview of the website (the last 30 builds are retained): To install this version:
|
| @@ -121,7 +120,7 @@ ensure-windows-buildx: | |||
| build-linux-image-amd64: | |||
| cd $(root_path) && docker build -f $(project_path)Dockerfile --tag=$(server_tag_linux_amd64) . | |||
| build-linux-image-arm64: | |||
| cd $(root_path) && docker build -f $(project_path)Dockerfile --platform linux/arm64 --tag=$(server_tag_linux_arm64) . | |||
| cd $(root_path) && docker buildx build --platform linux/arm64 -f $(project_path)Dockerfile $(DOCKER_BUILD_ARGS) --tag=$(server_tag_linux_arm64) . | |||
There was a problem hiding this comment.
my bad I forgot to enable buildx :s
| endif | ||
| ifeq ($(WITH_ARM64), 1) | ||
| push: push-linux-image-arm64 | ||
| endif | ||
| -DOCKER_CLI_EXPERIMENTAL=enabled docker manifest rm $(server_tag) |
There was a problem hiding this comment.
@Ludea - you previously had docker manifest annotate --os.version $(WINDOWS_VERSIONS) - but I'm not sure what it does, and we didn't have it anywhere else, so it was just easier to remove it.
Does it do anything important 😁?
There was a problem hiding this comment.
Also, just so you know - I rearranged this, because the command between target declarations don't run -- you actually can't do a if conditional around commands in a makefile, you can only change top level declarations (like add more dependencies).
There was a problem hiding this comment.
you previously had docker manifest annotate --os.version $(WINDOWS_VERSIONS) - but I'm not sure what it does, and we didn't have it anywhere else, so it was just easier to remove it.
I had it because of this comment cb7c28c#diff-6f4dc5b6a00ecf8904eece1a3f411736a2ae6bb76457b93b92b2360f2099060dL64
There was a problem hiding this comment.
Aaah. I think it's fine without it, but I guess we will see 😄
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: markmandel, roberthbailey The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
What type of PR is this?
kind bug
What this PR does / Why we need it:
Fixes:
go mod tidyotherwise failure to compileWhich issue(s) this PR fixes:
Work on #2216
Special notes for your reviewer:
Once this is merged, I can build the image and push (I tested with an image in my test project's registry).