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

CI: Update actions to latest versions, use default runner .NET version #88671

Merged
merged 1 commit into from
Mar 6, 2024

Conversation

akien-mga
Copy link
Member

@akien-mga akien-mga commented Feb 22, 2024

Only the first commit should be cherry-picked.

The .NET step change should likely not be cherry-picked.

@akien-mga akien-mga added enhancement topic:buildsystem cherrypick:3.x Considered for cherry-picking into a future 3.x release cherrypick:3.5 Considered for cherry-picking into a future 3.5.x release cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release labels Feb 22, 2024
@akien-mga akien-mga added this to the 4.3 milestone Feb 22, 2024
@akien-mga akien-mga requested a review from a team as a code owner February 22, 2024 15:24
@akien-mga akien-mga requested a review from a team February 22, 2024 15:24
Copy link
Member

@raulsntos raulsntos left a comment

Choose a reason for hiding this comment

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

Only the first commit should be cherry-picked.

There's only one commit though. Did you mean to keep the .NET version change in a separate commit?

if: ${{ matrix.build-mono }}
with:
dotnet-version: '6.0.x'
dotnet-version: '8.0.x'
Copy link
Member

Choose a reason for hiding this comment

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

I wonder if we should just remove this step since the image we use (ubuntu-20.04) already includes the .NET SDK1 so this step is just ignored, and the version that comes with the image is used instead (which was already 8.0).

See #86374.

Footnotes

  1. https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2004-Readme.md#net-tools

Copy link
Member

Choose a reason for hiding this comment

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

Ah, I was wondering where the runtime 6 was coming from. Your link explains it.

@akien-mga
Copy link
Member Author

Only the first commit should be cherry-picked.

There's only one commit though. Did you mean to keep the .NET version change in a separate commit?

Seems like I didn't push my two-commits version properly in the end. Oh well :D

Let's try the version with the dotnet setup step removed, and I'll just special case it when cherry-picking.

@akien-mga akien-mga changed the title CI: Update actions to latest versions, use .NET 8.0 CI: Update actions to latest versions, use default runner .NET version Feb 22, 2024
@akien-mga akien-mga merged commit aa8e9fe into godotengine:master Mar 6, 2024
16 checks passed
@akien-mga akien-mga deleted the ci-actions-update branch March 6, 2024 12:26
@akien-mga
Copy link
Member Author

Cherry-picked for 4.2.2.
Cherry-picked for 4.1.4.

Minus that part:

The .NET step change should likely not be cherry-picked.

@akien-mga akien-mga removed cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release labels Mar 9, 2024
@akien-mga
Copy link
Member Author

Cherry-picked for 3.6.
Cherry-picked for 3.5.4.

@akien-mga akien-mga removed cherrypick:3.x Considered for cherry-picking into a future 3.x release cherrypick:3.5 Considered for cherry-picking into a future 3.5.x release labels Apr 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants