diff options
| author | Tomas Mraz <tomas@openssl.org> | 2023-11-10 16:06:16 +0100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2023-11-24 15:14:15 +0100 |
| commit | 40a24c20a809916b43116c2bb16a36bdc40221f3 (patch) | |
| tree | 027cd84013f6b46db9b6d4542863b436ac145c43 /.github | |
| parent | 55ca75dd8fc4cbceb65f4ef40c921b0f5b8f7b90 (diff) | |
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 <hlandau@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22689)
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/ci.yml | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d90d0a2877..ac5d0956f5 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} |