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

Upgrade workflows to ubuntu-24 #18525

Merged
merged 7 commits into from
Jan 22, 2025
Merged

Conversation

oscarsj
Copy link
Contributor

@oscarsj oscarsj commented Jan 17, 2025

No changes in queries.

@github-actions github-actions bot added the C# label Jan 17, 2025
@oscarsj oscarsj marked this pull request as ready for review January 17, 2025 11:24
@Copilot Copilot bot review requested due to automatic review settings January 17, 2025 11:24
@oscarsj oscarsj requested review from a team as code owners January 17, 2025 11:24

Choose a reason for hiding this comment

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

Copilot reviewed 5 out of 11 changed files in this pull request and generated no comments.

Files not reviewed (6)
  • .devcontainer/swift/Dockerfile: Language not supported
  • csharp/ql/integration-tests/all-platforms/autobuild/autobuild.csproj: Language not supported
  • csharp/ql/integration-tests/all-platforms/autobuild/global.json: Language not supported
  • .github/workflows/swift.yml: Evaluated as low risk
  • actions/ql/test/query-tests/Security/CWE-094/.github/workflows/self_needs.yml: Evaluated as low risk
  • actions/ql/test/query-tests/Security/CWE-094/.github/workflows/test10.yml: Evaluated as low risk

Tip: Copilot code review supports C#, Go, Java, JavaScript, Markdown, Python, Ruby and TypeScript, with more languages coming soon. Learn more

Comment on lines -51 to -56
build-and-test-linux:
if: github.repository_owner == 'github'
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: ./swift/actions/build-and-test
Copy link
Contributor Author

Choose a reason for hiding this comment

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

swift not supported on ubuntu-24, so dropping this test

@@ -3,7 +3,6 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
Copy link
Contributor

@michaelnebel michaelnebel Jan 22, 2025

Choose a reason for hiding this comment

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

Maybe target net9.0 instead.

Copy link
Contributor Author

@oscarsj oscarsj Jan 22, 2025

Choose a reason for hiding this comment

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

I tested it, and upgrading this will require a coordinated PR in semmle-code and codeql. In the interest of time, reducing noise and wrapping up ubuntu migration, I'd like to leave the upgrade to net9 off the scope of this PR , and deal with it separatedly , could we do that?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes sure!

@oscarsj oscarsj force-pushed the oscarsj/upgrade-workflows-to-ubuntu24 branch from 623b0b6 to 208551c Compare January 22, 2025 11:10
@oscarsj oscarsj requested a review from michaelnebel January 22, 2025 11:29
# [Choice] Debian / Ubuntu version (use Debian 11, Ubuntu 18.04/22.04 on local arm64/Apple Silicon): debian-11, debian-10, ubuntu-22.04, ubuntu-20.04, ubuntu-18.04
FROM mcr.microsoft.com/vscode/devcontainers/cpp:0-ubuntu-22.04
# [Choice] Debian / Ubuntu version (use Debian 11, Ubuntu 18.04/22.04 on local arm64/Apple Silicon): debian-11, debian-10, ubuntu-22.04, ubuntu-24.04, ubuntu-20.04, ubuntu-18.04
FROM mcr.microsoft.com/vscode/devcontainers/cpp:0-ubuntu-24.04
Copy link
Contributor

Choose a reason for hiding this comment

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

how does this change relate to your comment "swift not supported on ubuntu-24, so dropping this test" below?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

good point, let me see if we can just remove this

Copy link
Contributor Author

Choose a reason for hiding this comment

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

removed all files on .devcontainer/swift, thanks for the heads up!

michaelnebel
michaelnebel previously approved these changes Jan 22, 2025
Copy link
Contributor

@michaelnebel michaelnebel left a comment

Choose a reason for hiding this comment

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

C# LGTM

@oscarsj oscarsj merged commit ebb10e3 into main Jan 22, 2025
23 checks passed
@oscarsj oscarsj deleted the oscarsj/upgrade-workflows-to-ubuntu24 branch January 22, 2025 15:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants