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

Update the deployment procedure #6409

Merged
merged 14 commits into from
Oct 4, 2024
Merged

Conversation

Garanas
Copy link
Member

@Garanas Garanas commented Aug 11, 2024

Description of the proposed changes

Update the deployment procedure together with @BlackYps . The majority of the steps should now be described.

For the other half of the changes, see also: a3de04d

@Garanas Garanas added the area: documentation related to documentation to preserve knowledge and practices label Aug 11, 2024
@Garanas Garanas requested a review from BlackYps August 11, 2024 19:31
@Garanas
Copy link
Member Author

Garanas commented Aug 11, 2024

After discussing it with @Sheikah45 , the deployment of the executable is as simple as copying whatever is the executable for FAF Develop is to the folder for FAF on the server. That means updating the executable for FAF Develop is necessary before asking the server administrators to update the executable.

docs/deployment.md Outdated Show resolved Hide resolved
docs/deployment.md Outdated Show resolved Hide resolved
docs/deployment.md Outdated Show resolved Hide resolved
Comment on lines 61 to 65
You can re-use the same branch and pull request in the next phase of the deployment.

### Deployment of Lua

The following (manual) steps are relevant to create a valid deployment to the FAF game type.
- (1) Checkout on the `changelog branch` branch created in the previous step and pull in the latest version.
Copy link
Contributor

Choose a reason for hiding this comment

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

These lines are kind of redundant now. I would just get rid of them, turning these two sections into one.

Copy link
Member Author

Choose a reason for hiding this comment

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

The Lua changes are separate from the changelog thematically. Can you make a suggestion on how you'd want this part of the documentation to be?

Copy link
Contributor

Choose a reason for hiding this comment

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

Sure

Copy link
Contributor

Choose a reason for hiding this comment

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

Ah, github doesn't let me create a suggestion here, so I'll have to do it more manually.
Replace all this

You can re-use the same branch and pull request in the next phase of the deployment.

### Deployment of Lua

- (1) Checkout on the `changelog branch` branch created in the previous step and pull in the latest version.
- (2) Update the game version in [mod_info.lua](https://github.com/FAForever/fa/blob/develop/mod_info.lua) and [version.lua](https://github.com/FAForever/fa/blob/develop/lua/version.lua).

with

- (8) Update the game version in [mod_info.lua](https://github.com/FAForever/fa/blob/develop/mod_info.lua) and [version.lua](https://github.com/FAForever/fa/blob/develop/lua/version.lua) and stage, commit and push the changes to GitHub.

Copy link
Member Author

Choose a reason for hiding this comment

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

Processed in 6cf8cca

docs/deployment.md Outdated Show resolved Hide resolved
docs/deployment.md Outdated Show resolved Hide resolved
docs/deployment.md Outdated Show resolved Hide resolved
- (4) Ask a server administrator to prepare the executable to be updated upon the next game release.
- - (4.1) This practically involves a copy operation where the server administrator verifies the executable of FAF Develop and copies it to a different location.

You can continue the deployment steps but you can not finalize it until the server administrator got back to you that it is set. This may take an arbitrary amount of time so make sure this is done well in advance.

### Changelog for a deployment
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
### Changelog for a deployment
### Prepare the new game version

I'd group changelog generation and preparations for the deployment of the lua files together as we process both in the same pull request.

Comment on lines 61 to 65
You can re-use the same branch and pull request in the next phase of the deployment.

### Deployment of Lua

The following (manual) steps are relevant to create a valid deployment to the FAF game type.
- (1) Checkout on the `changelog branch` branch created in the previous step and pull in the latest version.
Copy link
Contributor

Choose a reason for hiding this comment

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

Sure

Comment on lines 61 to 65
You can re-use the same branch and pull request in the next phase of the deployment.

### Deployment of Lua

The following (manual) steps are relevant to create a valid deployment to the FAF game type.
- (1) Checkout on the `changelog branch` branch created in the previous step and pull in the latest version.
Copy link
Contributor

Choose a reason for hiding this comment

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

Ah, github doesn't let me create a suggestion here, so I'll have to do it more manually.
Replace all this

You can re-use the same branch and pull request in the next phase of the deployment.

### Deployment of Lua

- (1) Checkout on the `changelog branch` branch created in the previous step and pull in the latest version.
- (2) Update the game version in [mod_info.lua](https://github.com/FAForever/fa/blob/develop/mod_info.lua) and [version.lua](https://github.com/FAForever/fa/blob/develop/lua/version.lua).

with

- (8) Update the game version in [mod_info.lua](https://github.com/FAForever/fa/blob/develop/mod_info.lua) and [version.lua](https://github.com/FAForever/fa/blob/develop/lua/version.lua) and stage, commit and push the changes to GitHub.

Comment on lines +83 to +84
- (3) Use the [Update SpookyDB](https://github.com/FAForever/fa/actions/workflows/spookydb-update.yaml) workflow to update [SpookyDB](https://github.com/FAForever/spooky-db)
- (4) Use the [Update UnitDB](https://github.com/FAForever/fa/actions/workflows/unitdb-update.yaml) workflow to update [UnitDB](https://github.com/FAForever/UnitDB)
Copy link
Contributor

Choose a reason for hiding this comment

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

The end of the file mentions that these happen automatically. So what is correct?

Copy link
Member Author

Choose a reason for hiding this comment

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

It should happen automatically, but last time it did not.

Garanas and others added 3 commits August 14, 2024 21:45
@BlackYps
Copy link
Contributor

rerequest my review when you are ready

@Garanas Garanas requested a review from BlackYps September 27, 2024 12:00
@Garanas Garanas merged commit 005af9d into develop Oct 4, 2024
4 checks passed
@Garanas Garanas deleted the documentation/deployment-06 branch October 4, 2024 19:33
lL1l1 pushed a commit to lL1l1/fa that referenced this pull request Oct 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: documentation related to documentation to preserve knowledge and practices
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants