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

github-ci: update Fedora 39 jobs to 41 #12342

Closed
wants to merge 1 commit into from
Closed

github-ci: update Fedora 39 jobs to 41 #12342

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 11 additions & 11 deletions .github/workflows/builds.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,10 +656,10 @@ jobs:
- run: make clean
- run: make -j ${{ env.CPUS }}

fedora-39-sv-codecov:
name: Fedora 39 (Suricata Verify codecov)
fedora-41-sv-codecov:
name: Fedora 41 (Suricata Verify codecov)
runs-on: ubuntu-latest
container: fedora:39
container: fedora:41
needs: [prepare-deps, prepare-cbindgen]
steps:

Expand Down Expand Up @@ -718,7 +718,7 @@ jobs:
zlib-devel
# packaged Rust version has no profiler support built in, so get from rustup
- name: Install Rust
run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.67.1 -y
run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.83 -y
Copy link
Contributor

Choose a reason for hiding this comment

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

MSRV still tested other places, so ok

Copy link
Member Author

Choose a reason for hiding this comment

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

yeah the point here was to make the coverage work. IIRC it needs the rust version to match the OS llvm version somehow. The older version failed, this works 🤷‍♂️

Copy link
Member

@jasonish jasonish Jan 8, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

I wonder if it would makes sense to use the system package here? The Rust RPM appears to depend on llvm-libs, where the rustup version embeds it own. Might be a way to keep them in sync. Or do that next time they are out of sync.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think rustc and the C compiler need to have the same profraw version INSTR_PROF_RAW_VERSION (like 9 or 10 today) you can take a look at google/oss-fuzz#12365

- run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- uses: ./.github/actions/install-cbindgen
Expand Down Expand Up @@ -752,11 +752,11 @@ jobs:
fail_ci_if_error: false
flags: suricata-verify

# Fedora 39 build using Clang.
fedora-39-clang:
name: Fedora 39 (clang, debug, asan, wshadow, rust-strict, systemd)
# Fedora 41 build using Clang.
fedora-41-clang:
name: Fedora 41 (clang, debug, asan, wshadow, rust-strict, systemd)
runs-on: ubuntu-latest
container: fedora:39
container: fedora:41
needs: [prepare-deps, prepare-cbindgen]
steps:

Expand Down Expand Up @@ -859,10 +859,10 @@ jobs:
- run: src/suricata --build-info | grep -E "Systemd support:\s+yes" &> /dev/null

# Fedora 39 build using GCC.
Copy link
Contributor

Choose a reason for hiding this comment

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

Comment could be updated to Fedora 41

fedora-39-gcc:
name: Fedora 39 (gcc, debug, asan, wshadow, rust-strict)
fedora-41-gcc:
name: Fedora 41 (gcc, debug, asan, wshadow, rust-strict)
runs-on: ubuntu-latest
container: fedora:39
container: fedora:41
needs: [prepare-deps, prepare-cbindgen]
steps:

Expand Down
Loading