update xonotic example to 0.8.6 #3273

ashutosji · 2023-07-18T11:06:24Z

What type of PR is this?

Uncomment only one /kind <> line, press enter to put that in a new line, and remove leading whitespace from that line:

/kind breaking
/kind bug
/kind cleanup
/kind documentation
/kind feature
/kind hotfix
/kind release

What this PR does / Why we need it:

Which issue(s) this PR fixes:

Closes #3233

Special notes for your reviewer:

agones-bot · 2023-07-18T12:17:44Z

Build Succeeded 👏

Build Id: 1d3557da-a691-434b-b3e1-40c5523da559

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):

https://0e2a9e7-dot-preview-dot-agones-images.appspot.com/

To install this version:

git fetch https://github.com/googleforgames/agones.git pull/3273/head:pr_3273 && git checkout pr_3273
helm install agones ./install/helm/agones --namespace agones-system --set agones.image.registry=us-docker.pkg.dev/agones-images/ci --set agones.image.tag=1.34.0-dev-0e2a9e7-amd64

markmandel · 2023-07-19T22:00:14Z

We had a chat offline, but just wanted to confirm that with the changes both the Linux and Windows image build?

ashutosji · 2023-07-21T07:51:38Z

We had a chat offline, but just wanted to confirm that with the changes both the Linux and Windows image build?

Linux image build working as expected but I am not able to build Windows image due to system issue.

agones-bot · 2023-07-27T12:59:46Z

Build Failed 😱

Build Id: e93dd269-abdb-458f-a25c-ff8669c76d6b

To get permission to view the Cloud Build view, join the agones-discuss Google Group.

markmandel

At first glance - this look great! Just running a local test as well to double check everything runs as expected.

Only extra thing, we'll need to update the push target to build the multi-arch manifest.

You can use the simple-game-server as example:

agones/examples/simple-game-server/Makefile

Lines 78 to 87 in 4d1086f

    
           push: push-linux-image-amd64 
        
           ifeq ($(WITH_WINDOWS), 1) 
        
           push: push-windows-images 
        
           endif 
        
           ifeq ($(WITH_ARM64), 1) 
        
           push: push-linux-image-arm64 
        
           endif 
        
           	-docker manifest rm $(server_tag) 
        
           	docker manifest create $(server_tag) $(push_server_manifest) 
        
           	docker manifest push $(server_tag) --purge

Take a look, but definitely let me know if you have any questions on the above.

agones-bot · 2023-08-03T10:44:38Z

Build Succeeded 👏

Build Id: f1aa6419-df2f-4a76-83cc-d08dcd224507

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):

https://5d576d6-dot-preview-dot-agones-images.appspot.com/

To install this version:

git fetch https://github.com/googleforgames/agones.git pull/3273/head:pr_3273 && git checkout pr_3273
helm install agones ./install/helm/agones --namespace agones-system --set agones.image.registry=us-docker.pkg.dev/agones-images/ci --set agones.image.tag=1.34.0-dev-5d576d6-amd64

markmandel · 2023-08-03T20:01:21Z

examples/xonotic/Makefile

+ifeq ($(WITH_WINDOWS), 1)
+push_server_manifest += $(foreach windows_version, $(WINDOWS_VERSIONS), $(server_tag)-windows_amd64-$(windows_version))
+endif
+ifeq ($(WITH_ARM64), 1)


I just double checked: https://xonotic.org/download/

And Xonotic doesn't support Arm, only x86-64 - so let's remove the arm support please.

I just double checked: https://xonotic.org/download/

And Xonotic doesn't support Arm, only x86-64 - so let's remove the arm support please.

Sure, I will remove it.

markmandel · 2023-08-03T20:05:16Z

examples/xonotic/Makefile

+ifeq ($(WITH_WINDOWS), 1)
+server_tag_linux_amd64 = $(server_tag)-linux-amd64
+server_tag_linux_arm64 = $(server_tag)-linux-arm64
+else
+server_tag_linux_amd64 = $(server_tag)-amd64
+server_tag_linux_arm64 = $(server_tag)-arm64
+endif


Suggested change

ifeq ($(WITH_WINDOWS), 1)

server_tag_linux_amd64 = $(server_tag)-linux-amd64

server_tag_linux_arm64 = $(server_tag)-linux-arm64

else

server_tag_linux_amd64 = $(server_tag)-amd64

server_tag_linux_arm64 = $(server_tag)-arm64

endif

server_tag_linux_amd64 = $(server_tag)-linux-amd64

server_tag_linux_arm64 = $(server_tag)-linux-arm64

I know we do this everywhere, but I don't know why, so let's break the habit and remove the conditional. It's not really doing anything.

I know we do this everywhere, but I don't know why, so let's break the habit and remove the conditional. It's not really doing anything.

Even, I was confused why we are doing this everywhere. But, At the end I had to follow the coding guidelines (Current codebase written in this way)

server_tag_linux_arm64 = $(server_tag)-linux-arm64
I think, this is not required. Since, Xonotic does not have support for ARM64, I am removing everthing related to ARM64 in makefile.

markmandel

Tried to run this but ran into an issue - I expect it's because I ran with WITH_ARM=0, so will try again once the ARM support is gone, I expect it will resolve the issue.

agones-bot · 2023-08-04T09:39:49Z

Build Succeeded 👏

Build Id: a4a8ecef-25d2-45a1-902d-c6a0d208b871

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):

https://59814a4-dot-preview-dot-agones-images.appspot.com/

To install this version:

git fetch https://github.com/googleforgames/agones.git pull/3273/head:pr_3273 && git checkout pr_3273
helm install agones ./install/helm/agones --namespace agones-system --set agones.image.registry=us-docker.pkg.dev/agones-images/ci --set agones.image.tag=1.34.0-dev-59814a4-amd64

markmandel

Just ran this locally - and looks good!

Only thing left to do, is change the image to 1.2 in all the yaml files in https://github.com/googleforgames/agones/tree/main/examples/xonotic and we can merge this in!

ashutosji · 2023-08-07T06:56:49Z

Just ran this locally - and looks good!

Only thing left to do, is change the image to 1.2 in all the yaml files in https://github.com/googleforgames/agones/tree/main/examples/xonotic and we can merge this in!

All yaml file are having 1.2 except fleet.yaml. I have updated that too. I think, we can merge this.

agones-bot · 2023-08-07T07:53:50Z

Build Succeeded 👏

Build Id: 817e3102-4691-4384-acb6-f8bbf3ddfd75

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):

https://f81cc71-dot-preview-dot-agones-images.appspot.com/

To install this version:

git fetch https://github.com/googleforgames/agones.git pull/3273/head:pr_3273 && git checkout pr_3273
helm install agones ./install/helm/agones --namespace agones-system --set agones.image.registry=us-docker.pkg.dev/agones-images/ci --set agones.image.tag=1.34.0-dev-f81cc71-amd64

markmandel

Looks good!

google-oss-prow · 2023-08-07T20:26:24Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aimuz, ashutosji, markmandel

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:

~~OWNERS~~ [markmandel]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

google-oss-prow bot requested review from markmandel and roberthbailey July 18, 2023 11:06

google-oss-prow bot added the size/S label Jul 18, 2023

github-actions bot added the kind/feature New features for Agones label Jul 18, 2023

aimuz approved these changes Jul 19, 2023

View reviewed changes

google-oss-prow bot assigned aimuz Jul 19, 2023

google-oss-prow bot added the lgtm label Jul 19, 2023

ashutosji force-pushed the update-xonotic-example branch from 0e2a9e7 to 76f0346 Compare July 27, 2023 11:44

google-oss-prow bot added size/M and removed lgtm size/S labels Jul 27, 2023

markmandel reviewed Aug 2, 2023

View reviewed changes

ashutosji force-pushed the update-xonotic-example branch from 76f0346 to 5d576d6 Compare August 3, 2023 09:45

google-oss-prow bot added size/L and removed size/M labels Aug 3, 2023

markmandel mentioned this pull request Aug 3, 2023

Cloud Build Script For Xonotic #3286

Closed

markmandel reviewed Aug 3, 2023

View reviewed changes

ashutosji force-pushed the update-xonotic-example branch from 5d576d6 to 59814a4 Compare August 4, 2023 08:41

markmandel reviewed Aug 4, 2023

View reviewed changes

ashutosji added 3 commits August 7, 2023 06:53

update xonotic example

d49b28f

changes for xonotic windows game server build

ad559e3

updated makefile for push with arm support image

72dddc0

ashutosji added 2 commits August 7, 2023 06:53

removed arm support

ecc381a

update image to 1.2

f81cc71

ashutosji force-pushed the update-xonotic-example branch from 59814a4 to f81cc71 Compare August 7, 2023 06:55

markmandel approved these changes Aug 7, 2023

View reviewed changes

google-oss-prow bot assigned markmandel Aug 7, 2023

google-oss-prow bot added the lgtm label Aug 7, 2023

google-oss-prow bot added the approved label Aug 7, 2023

markmandel merged commit 1d31913 into googleforgames:main Aug 7, 2023
2 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

update xonotic example to 0.8.6 #3273

update xonotic example to 0.8.6 #3273

ashutosji commented Jul 18, 2023

agones-bot commented Jul 18, 2023

markmandel commented Jul 19, 2023

ashutosji commented Jul 21, 2023

agones-bot commented Jul 27, 2023

markmandel left a comment

agones-bot commented Aug 3, 2023

markmandel Aug 3, 2023

ashutosji Aug 4, 2023

markmandel Aug 3, 2023

ashutosji Aug 4, 2023

ashutosji Aug 4, 2023

markmandel left a comment

agones-bot commented Aug 4, 2023

markmandel left a comment

ashutosji commented Aug 7, 2023 •

edited

Loading

agones-bot commented Aug 7, 2023

markmandel left a comment

google-oss-prow bot commented Aug 7, 2023

	push: push-linux-image-amd64
	ifeq ($(WITH_WINDOWS), 1)
	push: push-windows-images
	endif
	ifeq ($(WITH_ARM64), 1)
	push: push-linux-image-arm64
	endif
	-docker manifest rm $(server_tag)
	docker manifest create $(server_tag) $(push_server_manifest)
	docker manifest push $(server_tag) --purge

update xonotic example to 0.8.6 #3273

update xonotic example to 0.8.6 #3273

Conversation

ashutosji commented Jul 18, 2023

agones-bot commented Jul 18, 2023

markmandel commented Jul 19, 2023

ashutosji commented Jul 21, 2023

agones-bot commented Jul 27, 2023

markmandel left a comment

Choose a reason for hiding this comment

agones-bot commented Aug 3, 2023

markmandel Aug 3, 2023

Choose a reason for hiding this comment

ashutosji Aug 4, 2023

Choose a reason for hiding this comment

markmandel Aug 3, 2023

Choose a reason for hiding this comment

ashutosji Aug 4, 2023

Choose a reason for hiding this comment

ashutosji Aug 4, 2023

Choose a reason for hiding this comment

markmandel left a comment

Choose a reason for hiding this comment

agones-bot commented Aug 4, 2023

markmandel left a comment

Choose a reason for hiding this comment

ashutosji commented Aug 7, 2023 • edited Loading

agones-bot commented Aug 7, 2023

markmandel left a comment

Choose a reason for hiding this comment

google-oss-prow bot commented Aug 7, 2023

ashutosji commented Aug 7, 2023 •

edited

Loading