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

[20542] Pin CMake version and vm.mmap_rnd_bits in sanitizer workflows (backport #4558) #4567

Merged
merged 1 commit into from
Mar 17, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 15, 2024

Description

Since the roll out of Github Ubuntu 22.04 (20240310) Image, ASan and TSan jobs have been failing. The issue was reported in actions/runner-images#9491 and fixed in actions/runner-images#9513. Until that fix is deployed, this PR:

  1. Sets kernel param vm.mmap_rnd_bits to 28 as a workaround
  2. Pins the CMake version used in all 3 sanitizer jobs.

@Mergifyio backport 2.13.x 2.12.x 2.10.x 2.6.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • N/A: The code follows the style guidelines of this project.

  • N/A: Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally

  • N/A: Any new/modified methods have been properly documented using Doxygen.

  • N/A: Changes are ABI compatible.

  • N/A: Changes are API compatible.

  • N/A: New feature has been added to the versions.md file (if applicable).

  • N/A: New feature has been documented/Current behavior is correctly described in the documentation.

  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

This is an automatic backport of pull request #4558 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Mar 15, 2024
Copy link
Contributor Author

mergify bot commented Mar 15, 2024

Cherry-pick of 0c439a0 has failed:

On branch mergify/bp/2.12.x/pr-4558
Your branch is up to date with 'origin/2.12.x'.

You are currently cherry-picking commit 0c439a09a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   .github/workflows/config/asan.repos
	modified:   .github/workflows/config/tsan_colcon.meta
	modified:   .github/workflows/reusable-mac-ci.yml
	modified:   .github/workflows/reusable-ubuntu-ci.yml
	modified:   .github/workflows/reusable-windows-ci.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/address-sanitizers.yaml
	both modified:   .github/workflows/config/asan_colcon.meta
	both modified:   .github/workflows/thread-sanitizer.yaml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@EduPonz EduPonz added this to the v2.12.2 - Frozen milestone Mar 15, 2024
@EduPonz EduPonz force-pushed the mergify/bp/2.12.x/pr-4558 branch from d9e879a to ba0e727 Compare March 16, 2024 14:22
@EduPonz EduPonz added first-to-merge and removed conflicts Backport PR wich git cherry pick failed labels Mar 16, 2024
@EduPonz EduPonz closed this Mar 16, 2024
@EduPonz EduPonz reopened this Mar 16, 2024
@EduPonz EduPonz force-pushed the mergify/bp/2.12.x/pr-4558 branch from ba0e727 to 421ffde Compare March 16, 2024 14:34
@EduPonz EduPonz force-pushed the mergify/bp/2.12.x/pr-4558 branch from 421ffde to d8d0d2c Compare March 16, 2024 14:50
…#4558)

* Refs #20542: Fix CMake version in sanitizer workflows

Signed-off-by: EduPonz <[email protected]>

* Refs #20542: Install correct version of Gtest

Signed-off-by: EduPonz <[email protected]>

* fixup! Refs #20542: Fix CMake version in sanitizer workflows

* Refs #20542: Set number of random bits for mmap to 28

Signed-off-by: EduPonz <[email protected]>

* Refs #20542: Fix asan_colcon.meta

Signed-off-by: EduPonz <[email protected]>

* Refs #20542: Use CCache also for ASan DS

Signed-off-by: EduPonz <[email protected]>

---------

Signed-off-by: EduPonz <[email protected]>
(cherry picked from commit 0c439a0)
Signed-off-by: EduPonz <[email protected]>
@EduPonz EduPonz force-pushed the mergify/bp/2.12.x/pr-4558 branch from d8d0d2c to 13902cb Compare March 16, 2024 14:50
@EduPonz EduPonz merged commit e090fff into 2.12.x Mar 17, 2024
6 of 10 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.12.x/pr-4558 branch March 17, 2024 07:42
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.

1 participant