Skip to content

Commit

Permalink
When abidiff fails print out the XML diff
Browse files Browse the repository at this point in the history
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 #22689)
  • Loading branch information
t8m committed Nov 24, 2023
1 parent 55ca75d commit 40a24c2
Showing 1 changed file with 11 additions and 3 deletions.
14 changes: 11 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}

Expand Down

0 comments on commit 40a24c2

Please sign in to comment.