upgrade xonotic version #2669

mridulji · 2022-07-12T18:07:21Z

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

What this PR does / Why we need it: This PR upgrades the xonotic version to 0.8.5 provided in the examples.
Which issue(s) this PR fixes:

Closes #2664

Special notes for your reviewer:

Updated golang version in this example to resolve build failure.
Added go.mod file to support newer version on golang
Updated base image debian:stretch to debian:bullseye

agones-bot · 2022-07-12T18:34:52Z

Build Succeeded 👏

Build Id: 172601d2-4649-46c8-8007-0d6e4ef59470

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://87568ff-dot-preview-dot-agones-images.appspot.com/

To install this version:

git fetch https://github.com/googleforgames/agones.git pull/2669/head:pr_2669 && git checkout pr_2669
helm install agones ./install/helm/agones --namespace agones-system --set agones.image.tag=1.25.0-87568ff-amd64

roberthbailey · 2022-07-12T23:00:18Z

examples/xonotic/go.mod

@@ -0,0 +1,19 @@
+module agones.dev/agones/examples/xonotic


Can you still run make build from this directory to build this locally outside of the docker container?

Before making these changes, I am not able to build image but go build -o wrapper . command creating the binary locally.

After making changes, I am able to build it both ways.

roberthbailey · 2022-07-12T23:01:17Z

examples/xonotic/go.mod

+	google.golang.org/protobuf v1.26.0 // indirect
+)
+
+replace agones.dev/agones v0.0.0-dev => ../../


@markmandel - what do you think about building this from head vs. a specific agones release? STK is currently built against 1.8.0, which is pretty old but also makes it clear the last time we updated it as well as making the build reproducible.

🤔 hmnn, that's a good question.

The benefit I see of running against the development branch is that you can build out an example against something that is currently being worked on and not released.

That being said - pointing to a specific version (like we do in STK) is probably a better experience for the end user, so we should probably be consistent and do the same here.

It would also make the Docker build simpler as we don't have to force building from project root and copying in files (basically copy what we do in STK).

If we need to have in-development features, we can worry about it when it happens.

The only conflict I have - in simple-game-server we do probably want to continue building against a development version, as editing that binary is often necessary to implementing and testing new features. So that's likely the exception to the above rule.

Sound good?

pointing to a specific version (like we do in STK) is probably a better experience

I also feel that xonotic is pretty much similar STK example.

If we need to have in-development features, we can worry about it when it happens.

Should we target to agones v1.8.0 (Works fine, just tested) or any other specific version?

Let's use what is latest - 1.24.0. Then we know when this example was built.

agones-bot · 2022-07-19T10:38:09Z

Build Succeeded 👏

Build Id: e68f48f5-5ab3-4f36-abbd-f29484f1e742

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://2a4ea06-dot-preview-dot-agones-images.appspot.com/

To install this version:

git fetch https://github.com/googleforgames/agones.git pull/2669/head:pr_2669 && git checkout pr_2669
helm install agones ./install/helm/agones --namespace agones-system --set agones.image.tag=1.25.0-2a4ea06-amd64

markmandel · 2022-07-20T18:59:38Z

examples/xonotic/Makefile

@@ -41,6 +41,10 @@ image_tag = $(REPOSITORY)/xonotic-example:0.8
 build:
 	cd $(root_path) && docker build -f $(project_path)/Dockerfile --tag=$(image_tag) .


Suggested change

cd $(root_path) && docker build -f $(project_path)/Dockerfile --tag=$(image_tag) .

docker build -f $(project_path)/Dockerfile --tag=$(image_tag) .

We no longer need all of Agones to build it, so we can avoid a big Docker context pull now!

STK example:

agones/examples/supertuxkart/Makefile

Lines 40 to 41 in 15e9000

build:

docker build -f $(project_path)/Dockerfile --tag=$(image_tag) .

Other than that, I think this is good to go (I should test making it, but I'll do that one this is complete).

Not for this PR - but I noticed that make build doesn't build the windows image -- we should probably track that work somewhere.

Thanks for the suggestion 😃. Please see if it looks good now.

agones-bot · 2022-07-22T12:36:08Z

Build Succeeded 👏

Build Id: af499f85-5af1-48bc-b317-c3aafd5d4e0b

The following development artifacts have been built, and will exist for the next 30 days:

image: us-docker.pkg.dev/agones-images/ci/agones-controller:1.25.0-24332bd-amd64
image: us-docker.pkg.dev/agones-images/ci/agones-sdk:1.25.0-24332bd-linux-amd64
image: us-docker.pkg.dev/agones-images/ci/agones-ping:1.25.0-24332bd-amd64
image: us-docker.pkg.dev/agones-images/ci/agones-allocator:1.25.0-24332bd-amd64
Linux C++ SDK (build): agonessdk-1.25.0-24332bd-amd64-linux-arch_64.tar.gz
SDK Server: agonessdk-server-1.25.0-24332bd-amd64.zip

A preview of the website (the last 30 builds are retained):

https://24332bd-dot-preview-dot-agones-images.appspot.com/

To install this version:

git fetch https://github.com/googleforgames/agones.git pull/2669/head:pr_2669 && git checkout pr_2669
helm install agones ./install/helm/agones --namespace agones-system --set agones.image.tag=1.25.0-24332bd-amd64

google-oss-prow · 2022-07-22T17:23:42Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: markmandel, mridulji

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 · 2022-07-22T17:23:50Z

New changes are detected. LGTM label has been removed.

agones-bot · 2022-07-22T17:49:34Z

Build Succeeded 👏

Build Id: ea112731-4f1d-40fd-b05e-b9546475661f

The following development artifacts have been built, and will exist for the next 30 days:

image: us-docker.pkg.dev/agones-images/ci/agones-controller:1.25.0-ebbd3de-amd64
image: us-docker.pkg.dev/agones-images/ci/agones-sdk:1.25.0-ebbd3de-linux-amd64
image: us-docker.pkg.dev/agones-images/ci/agones-ping:1.25.0-ebbd3de-amd64
image: us-docker.pkg.dev/agones-images/ci/agones-allocator:1.25.0-ebbd3de-amd64
Linux C++ SDK (build): agonessdk-1.25.0-ebbd3de-amd64-linux-arch_64.tar.gz
SDK Server: agonessdk-server-1.25.0-ebbd3de-amd64.zip

A preview of the website (the last 30 builds are retained):

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

To install this version:

git fetch https://github.com/googleforgames/agones.git pull/2669/head:pr_2669 && git checkout pr_2669
helm install agones ./install/helm/agones --namespace agones-system --set agones.image.tag=1.25.0-ebbd3de-amd64

mridulji requested a review from markmandel July 12, 2022 18:07

google-oss-prow bot added the size/L label Jul 12, 2022

google-oss-prow bot requested review from pooneh-m and roberthbailey July 12, 2022 18:07

mridulji changed the title ~~upgrade xonotic, golang and debian version~~ upgrade xonotic version Jul 12, 2022

roberthbailey reviewed Jul 12, 2022

View reviewed changes

SaitejaTamma added kind/feature New features for Agones area/examples Examples. Usually found in the `examples` directory labels Jul 13, 2022

mridulji force-pushed the upgrade_xonotic branch from 87568ff to 2a4ea06 Compare July 19, 2022 10:11

markmandel reviewed Jul 20, 2022

View reviewed changes

mridulji added 3 commits July 22, 2022 09:17

upgrade xonotic, golang and debian version

6dfab92

targeting specific agones version

4398503

filtering files to include in docker image

24332bd

mridulji force-pushed the upgrade_xonotic branch from 2a4ea06 to 24332bd Compare July 22, 2022 12:09

markmandel approved these changes Jul 22, 2022

View reviewed changes

google-oss-prow bot assigned markmandel Jul 22, 2022

google-oss-prow bot added the lgtm label Jul 22, 2022

google-oss-prow bot added the approved label Jul 22, 2022

Merge branch 'main' into upgrade_xonotic

ebbd3de

google-oss-prow bot removed the lgtm label Jul 22, 2022

markmandel merged commit f0a4ec9 into googleforgames:main Jul 22, 2022

markmandel added this to the 1.25.0 milestone Jul 22, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

upgrade xonotic version #2669

upgrade xonotic version #2669

mridulji commented Jul 12, 2022 •

edited by SaitejaTamma

Loading

agones-bot commented Jul 12, 2022

roberthbailey Jul 12, 2022

mridulji Jul 13, 2022

roberthbailey Jul 12, 2022

markmandel Jul 13, 2022

mridulji Jul 18, 2022

markmandel Jul 18, 2022

agones-bot commented Jul 19, 2022

markmandel Jul 20, 2022

mridulji Jul 22, 2022

agones-bot commented Jul 22, 2022

google-oss-prow bot commented Jul 22, 2022

google-oss-prow bot commented Jul 22, 2022

agones-bot commented Jul 22, 2022

		@@ -41,6 +41,10 @@ image_tag = $(REPOSITORY)/xonotic-example:0.8
		build:
		cd $(root_path) && docker build -f $(project_path)/Dockerfile --tag=$(image_tag) .

	cd $(root_path) && docker build -f $(project_path)/Dockerfile --tag=$(image_tag) .
	docker build -f $(project_path)/Dockerfile --tag=$(image_tag) .

upgrade xonotic version #2669

upgrade xonotic version #2669

Conversation

mridulji commented Jul 12, 2022 • edited by SaitejaTamma Loading

agones-bot commented Jul 12, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

agones-bot commented Jul 19, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

agones-bot commented Jul 22, 2022

google-oss-prow bot commented Jul 22, 2022

google-oss-prow bot commented Jul 22, 2022

agones-bot commented Jul 22, 2022

mridulji commented Jul 12, 2022 •

edited by SaitejaTamma

Loading