From e1a90b9d819faad0025f69e18fd166ab5d6bd743 Mon Sep 17 00:00:00 2001 From: Mischan Toosarani-Hausberger Date: Fri, 15 Mar 2024 11:05:49 +0100 Subject: [PATCH 1/7] Update python test dependencies --- tests/requirements.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index c90370ba0..f2b95fabd 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,4 +1,4 @@ -black==23.3.0 -pytest==7.4.0 -pytest-httpserver==1.0.8 -msgpack==1.0.5 +black==24.2.0 +pytest==8.0.1 +pytest-httpserver==1.0.10 +msgpack==1.0.8 From a0e8abe3823a91a6081ca3d7bfdee39bcb56fa14 Mon Sep 17 00:00:00 2001 From: Mischan Toosarani-Hausberger Date: Fri, 15 Mar 2024 11:22:26 +0100 Subject: [PATCH 2/7] Update clang on Linux to 15.0.7 --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 13c748df8..01de2a06e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,14 +49,14 @@ jobs: # RUN_ANALYZER: gcc - name: Linux (clang + asan + llvm-cov) os: ubuntu-22.04 - CC: clang-14 - CXX: clang++-14 + CC: clang-15 + CXX: clang++-15 ERROR_ON_WARNINGS: 1 RUN_ANALYZER: asan,llvm-cov - name: Linux (clang + kcov) os: ubuntu-22.04 - CC: clang-14 - CXX: clang++-14 + CC: clang-15 + CXX: clang++-15 ERROR_ON_WARNINGS: 1 RUN_ANALYZER: kcov - name: Linux (gcc + code-checker + valgrind) From a3912141c399103246ef58a563e88de822c16fe7 Mon Sep 17 00:00:00 2001 From: Mischan Toosarani-Hausberger Date: Fri, 15 Mar 2024 13:46:50 +0100 Subject: [PATCH 3/7] Isolate only asan --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 01de2a06e..36b042b05 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,7 +52,7 @@ jobs: CC: clang-15 CXX: clang++-15 ERROR_ON_WARNINGS: 1 - RUN_ANALYZER: asan,llvm-cov + RUN_ANALYZER: asan - name: Linux (clang + kcov) os: ubuntu-22.04 CC: clang-15 From bb72f78092be8fa49b29219f4dc478994f925a7d Mon Sep 17 00:00:00 2001 From: Mischan Toosarani-Hausberger Date: Fri, 15 Mar 2024 13:55:52 +0100 Subject: [PATCH 4/7] Isolate only llvm-cov --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 36b042b05..8aba8e820 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,7 +52,7 @@ jobs: CC: clang-15 CXX: clang++-15 ERROR_ON_WARNINGS: 1 - RUN_ANALYZER: asan + RUN_ANALYZER: llvm-cov - name: Linux (clang + kcov) os: ubuntu-22.04 CC: clang-15 From 230d0a7fce3afbe295f4a841fb45ad4106cb09fb Mon Sep 17 00:00:00 2001 From: Mischan Toosarani-Hausberger Date: Fri, 15 Mar 2024 14:07:08 +0100 Subject: [PATCH 5/7] disable asan and switch back to clang-14 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8aba8e820..6c3c7d122 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,8 +49,8 @@ jobs: # RUN_ANALYZER: gcc - name: Linux (clang + asan + llvm-cov) os: ubuntu-22.04 - CC: clang-15 - CXX: clang++-15 + CC: clang-14 + CXX: clang++-14 ERROR_ON_WARNINGS: 1 RUN_ANALYZER: llvm-cov - name: Linux (clang + kcov) From a4950d47c4dc70addd0b5ae2c7063096848ad42e Mon Sep 17 00:00:00 2001 From: Mischan Toosarani-Hausberger Date: Fri, 15 Mar 2024 14:24:11 +0100 Subject: [PATCH 6/7] enable asan + clang-15 and adapt mmap_rnd_bit... ...according to https://github.com/actions/runner-images/pull/9513 --- .github/workflows/ci.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6c3c7d122..38cb54361 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,10 +49,10 @@ jobs: # RUN_ANALYZER: gcc - name: Linux (clang + asan + llvm-cov) os: ubuntu-22.04 - CC: clang-14 - CXX: clang++-14 + CC: clang-15 + CXX: clang++-15 ERROR_ON_WARNINGS: 1 - RUN_ANALYZER: llvm-cov + RUN_ANALYZER: asan,llvm-cov - name: Linux (clang + kcov) os: ubuntu-22.04 CC: clang-15 @@ -137,6 +137,11 @@ jobs: sudo apt update sudo apt install cmake gcc-7-multilib g++-7-multilib zlib1g-dev:i386 libssl-dev:i386 libcurl4-openssl-dev:i386 + # https://github.com/actions/runner-images/issues/9491 + - name: Decrease vm.mmap_rnd_bit to prevent ASLR ASAN issues + if: ${{ runner.os == 'Linux' && contains(env['RUN_ANALYZER'], 'asan') }} + run: sudo sysctl vm.mmap_rnd_bits=28 + - name: Installing CodeChecker if: ${{ contains(env['RUN_ANALYZER'], 'code-checker') }} run: sudo snap install codechecker --classic From 438045cecaea82d77d7341f1ab3fece733b7c475 Mon Sep 17 00:00:00 2001 From: Mischan Toosarani-Hausberger Date: Fri, 15 Mar 2024 14:26:37 +0100 Subject: [PATCH 7/7] Make black happy again. --- tests/assertions.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/assertions.py b/tests/assertions.py index 63b126ded..de97e9b6a 100644 --- a/tests/assertions.py +++ b/tests/assertions.py @@ -54,7 +54,10 @@ def assert_meta( "user": {"id": 42, "username": "some_name"}, "transaction": transaction, "tags": {"expected-tag": "some value"}, - "extra": {"extra stuff": "some value", "…unicode key…": "őá…–🤮🚀¿ 한글 테스트"}, + "extra": { + "extra stuff": "some value", + "…unicode key…": "őá…–🤮🚀¿ 한글 테스트", + }, } expected_sdk = { "name": "sentry.native",