https://github.com/tstellar created https://github.com/llvm/llvm-project/pull/133266
None >From b2b05ff2f84cb7963093752b9e0d3fe93a6cd021 Mon Sep 17 00:00:00 2001 From: Tom Stellard <tstel...@redhat.com> Date: Thu, 27 Mar 2025 08:11:08 -0700 Subject: [PATCH 1/3] workflows: Add missing apt-get update to abi tests --- .github/workflows/libclang-abi-tests.yml | 5 ++++- .github/workflows/llvm-tests.yml | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/libclang-abi-tests.yml b/.github/workflows/libclang-abi-tests.yml index 41b3075288d2d..ff8f38b43098e 100644 --- a/.github/workflows/libclang-abi-tests.yml +++ b/.github/workflows/libclang-abi-tests.yml @@ -103,6 +103,7 @@ jobs: uses: llvm/actions/install-ninja@main - name: Install abi-compliance-checker run: | + sudo apt-get update sudo apt-get install abi-dumper autoconf pkg-config - name: Install universal-ctags run: | @@ -154,7 +155,9 @@ jobs: path: build-latest - name: Install abi-compliance-checker - run: sudo apt-get install abi-compliance-checker + run: | + sudo apt-get update + sudo apt-get install abi-compliance-checker - name: Compare ABI run: | for lib in ${{ needs.abi-dump-setup.outputs.ABI_LIBS }}; do diff --git a/.github/workflows/llvm-tests.yml b/.github/workflows/llvm-tests.yml index 9b3d49d4e99b9..92debf2a8a269 100644 --- a/.github/workflows/llvm-tests.yml +++ b/.github/workflows/llvm-tests.yml @@ -91,6 +91,7 @@ jobs: uses: llvm/actions/install-ninja@main - name: Install abi-compliance-checker run: | + sudo apt-get update sudo apt-get install abi-dumper autoconf pkg-config - name: Install universal-ctags run: | @@ -163,7 +164,9 @@ jobs: path: symbol-list - name: Install abi-compliance-checker - run: sudo apt-get install abi-compliance-checker + run: | + sudo apt-get update + sudo apt-get install abi-compliance-checker - name: Compare ABI run: | if [ -s symbol-list/llvm.symbols ]; then >From f6c1c53267b35855cfdc450cc88761b2116ae050 Mon Sep 17 00:00:00 2001 From: Tom Stellard <tstel...@redhat.com> Date: Thu, 27 Mar 2025 08:20:25 -0700 Subject: [PATCH 2/3] [workflows] Use -g instead of -g1 for the abi tests This should improve the debuginfo and hopefully make the abi tests more accurate. --- .github/workflows/libclang-abi-tests.yml | 2 +- .github/workflows/llvm-tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/libclang-abi-tests.yml b/.github/workflows/libclang-abi-tests.yml index ff8f38b43098e..b740e5696350b 100644 --- a/.github/workflows/libclang-abi-tests.yml +++ b/.github/workflows/libclang-abi-tests.yml @@ -120,7 +120,7 @@ jobs: - name: Configure run: | mkdir install - cmake -B build -S llvm -G Ninja -DLLVM_ENABLE_PROJECTS=clang -DCMAKE_BUILD_TYPE=Debug -DLLVM_TARGETS_TO_BUILD="" -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON -DCMAKE_C_FLAGS_DEBUG="-g1 -Og" -DCMAKE_CXX_FLAGS_DEBUG="-g1 -Og" -DCMAKE_INSTALL_PREFIX="$(pwd)"/install llvm + cmake -B build -S llvm -G Ninja -DLLVM_ENABLE_PROJECTS=clang -DCMAKE_BUILD_TYPE=Debug -DLLVM_TARGETS_TO_BUILD="" -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON -DCMAKE_C_FLAGS_DEBUG="-g -Og" -DCMAKE_CXX_FLAGS_DEBUG="-g -Og" -DCMAKE_INSTALL_PREFIX="$(pwd)"/install llvm - name: Build run: ninja -C build/ ${{ needs.abi-dump-setup.outputs.ABI_LIBS }} install-clang-headers - name: Dump ABI diff --git a/.github/workflows/llvm-tests.yml b/.github/workflows/llvm-tests.yml index 92debf2a8a269..43cdccedfc894 100644 --- a/.github/workflows/llvm-tests.yml +++ b/.github/workflows/llvm-tests.yml @@ -108,7 +108,7 @@ jobs: - name: Configure run: | mkdir install - cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug -DLLVM_TARGETS_TO_BUILD="" -DLLVM_BUILD_LLVM_DYLIB=ON -DCMAKE_C_FLAGS_DEBUG="-g1 -Og" -DCMAKE_CXX_FLAGS_DEBUG="-g1 -Og" -DCMAKE_INSTALL_PREFIX="$(pwd)"/install llvm + cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug -DLLVM_TARGETS_TO_BUILD="" -DLLVM_BUILD_LLVM_DYLIB=ON -DCMAKE_C_FLAGS_DEBUG="-g -Og" -DCMAKE_CXX_FLAGS_DEBUG="-g -Og" -DCMAKE_INSTALL_PREFIX="$(pwd)"/install llvm - name: Build # Need to run install-LLVM twice to ensure the symlink is installed (this is a bug). run: | >From 12036ba96b6efc54973d895cd1db5ee6143e2804 Mon Sep 17 00:00:00 2001 From: Tom Stellard <tstel...@redhat.com> Date: Thu, 27 Mar 2025 08:25:56 -0700 Subject: [PATCH 3/3] [workfows] Run abi checks in the ci container This has a faster compiler and should help reduce build times. --- .github/workflows/libclang-abi-tests.yml | 2 ++ .github/workflows/llvm-tests.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/libclang-abi-tests.yml b/.github/workflows/libclang-abi-tests.yml index b740e5696350b..9c447250bfbdd 100644 --- a/.github/workflows/libclang-abi-tests.yml +++ b/.github/workflows/libclang-abi-tests.yml @@ -83,6 +83,8 @@ jobs: abi-dump: if: github.repository_owner == 'llvm' needs: abi-dump-setup + container: + image: 'ghcr.io/llvm/ci-ubuntu-22.04:latest' runs-on: ubuntu-latest strategy: matrix: diff --git a/.github/workflows/llvm-tests.yml b/.github/workflows/llvm-tests.yml index 43cdccedfc894..40347071cdbc9 100644 --- a/.github/workflows/llvm-tests.yml +++ b/.github/workflows/llvm-tests.yml @@ -72,6 +72,8 @@ jobs: if: github.repository_owner == 'llvm' needs: abi-dump-setup runs-on: ubuntu-latest + container: + image: 'ghcr.io/llvm/ci-ubuntu-22.04:latest' strategy: matrix: name: _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits