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.

Sign up for GitHub

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

Upgrade workflows to ubuntu-24 #18525

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b39bfdb
Upgrade workflows to ubuntu-24
oscarsj Jan 17, 2025
bb47f5b
Update csharp target framework to net9.0
oscarsj Jan 17, 2025
8ef4c2c
Remove ImplicitUsings label, not supported by Net 6.0
oscarsj Jan 17, 2025
82704c0
Suggestions from PR
oscarsj Jan 22, 2025
208551c
Update test expected strings for net9
oscarsj Jan 22, 2025
769c627
Revert updating .net version
oscarsj Jan 22, 2025
4fb2273
Remove .devcontainer/swift files, as testing swift on ubuntu 24 is no…
oscarsj Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .devcontainer/swift/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.236.0/containers/cpp/.devcontainer/base.Dockerfile

# [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!


USER root
ADD root.sh /tmp/root.sh
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/swift.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,6 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: ./swift/actions/build-and-test
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
Comment on lines -51 to -56
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

qltests-macos:
if: ${{ github.repository_owner == 'github' && github.event_name == 'pull_request' }}
needs: build-and-test-macos
Expand Down
2 changes: 1 addition & 1 deletion actions/ql/test/query-tests/Security/CWE-094/.github/workflows/self_needs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
test1:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
outputs:
job_output: ${{ steps.source.outputs.value }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion actions/ql/test/query-tests/Security/CWE-094/.github/workflows/test10.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ jobs:

send_results:
name: Send results to webhook
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: always()
needs: [
setup,
Expand Down
2 changes: 1 addition & 1 deletion actions/ql/test/query-tests/Security/CWE-094/.github/workflows/test23.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:

jobs:
test:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: >
(github.event.workflow_run.event == 'pull_request' ||
github.event.workflow_run.event == 'pull_request_target') &&
Expand Down
2 changes: 1 addition & 1 deletion actions/ql/test/query-tests/Security/CWE-094/.github/workflows/test24.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:

jobs:
test:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Run Issue form parser
id: parse
Expand Down
2 changes: 1 addition & 1 deletion actions/ql/test/query-tests/Security/CWE-829/.github/workflows/issue_comment_octokit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
test1:
if: github.event.comment.body == '@metabase-bot run visual tests'
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Fetch issue
uses: octokit/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion actions/ql/test/query-tests/Security/CWE-829/.github/workflows/issue_comment_octokit2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
test1:
if: github.event.comment.body == '@metabase-bot run visual tests'
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Fetch issue
uses: octokit/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions ...s/Violations Of Best Practice/CodeQL/.github/workflows/should_be_using_advanced_setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ jobs:
matrix:
include:
- language: javascript
os: ubuntu-22.04
os: ubuntu-24.04
- language: ruby
os: ubuntu-22.04-16core
os: ubuntu-24.04-16core

steps:
- name: Checkout repository
Expand Down
1 change: 0 additions & 1 deletion csharp/ql/integration-tests/all-platforms/autobuild/autobuild.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
Copy link
Contributor

@michaelnebel michaelnebel Jan 22, 2025 •
edited
Loading

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 •
edited
Loading

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!

<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion csharp/ql/integration-tests/all-platforms/autobuild/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "5.0.408"
"version": "9.0.100"
}
}