From 7b51843ce92c09c6c5d2db8129c689fa60613265 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Tue, 19 Mar 2024 09:56:17 +0100 Subject: [PATCH 1/6] tools: sync ubsan workflow with asan Configs have changed since the ubsan PR was initially opened. --- .github/workflows/test-ubsan.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-ubsan.yml b/.github/workflows/test-ubsan.yml index 25f2481720021c..1440cfd55eaa9a 100644 --- a/.github/workflows/test-ubsan.yml +++ b/.github/workflows/test-ubsan.yml @@ -45,19 +45,19 @@ jobs: LINK: g++ CONFIG_FLAGS: --enable-ubsan steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: persist-credentials: false - name: Store suppressions path run: | echo "UBSAN_OPTIONS=suppressions=$GITHUB_WORKSPACE/suppressions.supp" >> $GITHUB_ENV - name: Set up Python ${{ env.PYTHON_VERSION }} - uses: actions/setup-python@v4 + uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0 with: python-version: ${{ env.PYTHON_VERSION }} - name: Environment Information run: npx envinfo - name: Build - run: make build-ci -j2 V=1 + run: make build-ci -j4 V=1 - name: Test - run: make run-ci -j2 V=1 TEST_CI_ARGS="-p actions -t 300 --measure-flakiness 9" + run: make run-ci -j4 V=1 TEST_CI_ARGS="-p actions --node-args='--test-reporter=spec' --node-args='--test-reporter-destination=stdout' -t 300 --measure-flakiness 9" From 5a071f99ceb06c48bf71292a7fdae257e4aa8c05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Tue, 19 Mar 2024 10:00:38 +0100 Subject: [PATCH 2/6] fixup --- .github/workflows/test-ubsan.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-ubsan.yml b/.github/workflows/test-ubsan.yml index 1440cfd55eaa9a..94ee86b9e83166 100644 --- a/.github/workflows/test-ubsan.yml +++ b/.github/workflows/test-ubsan.yml @@ -9,7 +9,7 @@ on: - AUTHORS - doc/** - .github/** - - '!.github/workflows/ubsan-asan.yml' + - '!.github/workflows/test-ubsan.yml' push: branches: - main @@ -22,7 +22,7 @@ on: - AUTHORS - doc/** - .github/** - - '!.github/workflows/ubsan-asan.yml' + - '!.github/workflows/test-ubsan.yml' concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} From 2dfc88c32ee3401ef2feed7df6eaee3495322ac6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Tue, 19 Mar 2024 11:52:43 +0100 Subject: [PATCH 3/6] Update test-ubsan.yml fixup: try to build with -j3 --- .github/workflows/test-ubsan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-ubsan.yml b/.github/workflows/test-ubsan.yml index 94ee86b9e83166..664f7eef43e43c 100644 --- a/.github/workflows/test-ubsan.yml +++ b/.github/workflows/test-ubsan.yml @@ -58,6 +58,6 @@ jobs: - name: Environment Information run: npx envinfo - name: Build - run: make build-ci -j4 V=1 + run: make build-ci -j3 V=1 - name: Test run: make run-ci -j4 V=1 TEST_CI_ARGS="-p actions --node-args='--test-reporter=spec' --node-args='--test-reporter-destination=stdout' -t 300 --measure-flakiness 9" From 1544e7442453d947382161b5b0dd9cf378118002 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Tue, 19 Mar 2024 14:02:17 +0100 Subject: [PATCH 4/6] fixup: back to -j2 --- .github/workflows/test-ubsan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-ubsan.yml b/.github/workflows/test-ubsan.yml index 664f7eef43e43c..b987c6b732294b 100644 --- a/.github/workflows/test-ubsan.yml +++ b/.github/workflows/test-ubsan.yml @@ -58,6 +58,6 @@ jobs: - name: Environment Information run: npx envinfo - name: Build - run: make build-ci -j3 V=1 + run: make build-ci -j2 V=1 - name: Test run: make run-ci -j4 V=1 TEST_CI_ARGS="-p actions --node-args='--test-reporter=spec' --node-args='--test-reporter-destination=stdout' -t 300 --measure-flakiness 9" From 582547ab1007acba815d76efb0b7079e6bb403b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Tue, 19 Mar 2024 16:25:57 +0100 Subject: [PATCH 5/6] fixup: -j3 and in run-ci too --- .github/workflows/test-ubsan.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-ubsan.yml b/.github/workflows/test-ubsan.yml index b987c6b732294b..4312dd457e3af0 100644 --- a/.github/workflows/test-ubsan.yml +++ b/.github/workflows/test-ubsan.yml @@ -58,6 +58,6 @@ jobs: - name: Environment Information run: npx envinfo - name: Build - run: make build-ci -j2 V=1 + run: make build-ci -j3 V=1 - name: Test - run: make run-ci -j4 V=1 TEST_CI_ARGS="-p actions --node-args='--test-reporter=spec' --node-args='--test-reporter-destination=stdout' -t 300 --measure-flakiness 9" + run: make run-ci -j3 V=1 TEST_CI_ARGS="-p actions --node-args='--test-reporter=spec' --node-args='--test-reporter-destination=stdout' -t 300 --measure-flakiness 9" From ea41d48db7a4f8d34569a4efd709d1c3f63d4689 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Tue, 19 Mar 2024 18:52:15 +0100 Subject: [PATCH 6/6] Update test-ubsan.yml --- .github/workflows/test-ubsan.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-ubsan.yml b/.github/workflows/test-ubsan.yml index 4312dd457e3af0..a5def62af126c6 100644 --- a/.github/workflows/test-ubsan.yml +++ b/.github/workflows/test-ubsan.yml @@ -58,6 +58,6 @@ jobs: - name: Environment Information run: npx envinfo - name: Build - run: make build-ci -j3 V=1 + run: make build-ci -j2 V=1 - name: Test - run: make run-ci -j3 V=1 TEST_CI_ARGS="-p actions --node-args='--test-reporter=spec' --node-args='--test-reporter-destination=stdout' -t 300 --measure-flakiness 9" + run: make run-ci -j2 V=1 TEST_CI_ARGS="-p actions --node-args='--test-reporter=spec' --node-args='--test-reporter-destination=stdout' -t 300 --measure-flakiness 9"