From 40a24c20a809916b43116c2bb16a36bdc40221f3 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Fri, 10 Nov 2023 16:06:16 +0100 Subject: [PATCH] When abidiff fails print out the XML diff This can be useful for fixing the CI if needed without the necessity to run abidw locally. Also rename the CI job to make its purpose clearer. Reviewed-by: Hugo Landau Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/22689) --- .github/workflows/ci.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d90d0a2877f..ac5d0956f55 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -264,7 +264,7 @@ jobs: - name: make test run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} - fips_and_ktls: + full_feat_w_abidiff: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -287,9 +287,17 @@ jobs: cat /proc/cpuinfo ./util/opensslwrap.sh version -c - name: Check ABI compatibility for libcrypto - run: abidiff ./.github/workflows/libcrypto-abi.xml ./libcrypto.so + run: | + if ! abidiff ./.github/workflows/libcrypto-abi.xml ./libcrypto.so ; then + abidw --out-file libcrypto-abi-new.xml ./libcrypto.so + diff -u ./.github/workflows/libcrypto-abi.xml libcrypto-abi-new.xml + fi - name: Check ABI compatibility for libssl - run: abidiff ./.github/workflows/libssl-abi.xml ./libssl.so + run: | + if ! abidiff ./.github/workflows/libssl-abi.xml ./libssl.so ; then + abidw --out-file libssl-abi-new.xml ./libssl.so + diff -u ./.github/workflows/libssl-abi.xml libssl-abi-new.xml + fi - name: make test run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} -- 2.47.2