Skip to content

Commit 452500e

Browse files
committed
workflows: Use uncompressed abi dumps
The compressed dumps are no longer readable, but I'm not sure why.
1 parent 372e6fb commit 452500e

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

.github/workflows/libclang-abi-tests.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,12 @@ jobs:
113113
for lib in ${{ needs.abi-dump-setup.outputs.ABI_LIBS }}; do
114114
# Remove symbol versioning from dumps, so we can compare across major versions.
115115
sed -i 's/LLVM_${{ matrix.llvm_version_major }}/LLVM_NOVERSION/' $lib-${{ matrix.ref }}.abi
116-
tar -czf $lib-${{ matrix.ref }}.abi.tar.gz $lib-${{ matrix.ref }}.abi
117116
done
118117
- name: Upload ABI file
119118
uses: actions/upload-artifact@v2
120119
with:
121120
name: ${{ matrix.name }}
122-
path: "*${{ matrix.ref }}.abi.tar.gz"
121+
path: "*${{ matrix.ref }}.abi"
123122

124123
abi-compare:
125124
runs-on: ubuntu-latest
@@ -141,7 +140,7 @@ jobs:
141140
- name: Compare ABI
142141
run: |
143142
for lib in ${{ needs.abi-dump-setup.outputs.ABI_LIBS }}; do
144-
abi-compliance-checker -lib $lib -old build-baseline/$lib*.abi.tar.gz -new build-latest/$lib*.abi.tar.gz
143+
abi-compliance-checker -lib $lib -old build-baseline/$lib*.abi -new build-latest/$lib*.abi
145144
done
146145
- name: Upload ABI Comparison
147146
if: always()

.github/workflows/llvm-tests.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,11 @@ jobs:
126126
abi-dumper $EXTRA_ARGS -lver ${{ matrix.ref }} -skip-cxx -public-headers ./install/include/${{ needs.abi-dump-setup.outputs.ABI_HEADERS }} -o ${{ matrix.ref }}.abi ./install/lib/libLLVM.so
127127
# Remove symbol versioning from dumps, so we can compare across major versions.
128128
sed -i 's/LLVM_${{ matrix.llvm_version_major }}/LLVM_NOVERSION/' ${{ matrix.ref }}.abi
129-
tar -czf ${{ matrix.ref }}.abi.tar.gz ${{ matrix.ref }}.abi
130129
- name: Upload ABI file
131130
uses: actions/upload-artifact@v1
132131
with:
133132
name: ${{ matrix.name }}
134-
path: ${{ matrix.ref }}.abi.tar.gz
133+
path: ${{ matrix.ref }}.abi
135134

136135
- name: Upload symbol list file
137136
if: matrix.name == 'build-baseline'
@@ -167,7 +166,10 @@ jobs:
167166
# This option doesn't seem to work with the ABI dumper, so passing it here.
168167
export EXTRA_ARGS="-symbols-list symbol-list/llvm.symbols"
169168
fi
170-
abi-compliance-checker $EXTRA_ARGS -l libLLVM.so -old build-baseline/*.tar.gz -new build-latest/*.tar.gz || test "${{ needs.abi-dump-setup.outputs.ABI_HEADERS }}" = "llvm-c"
169+
# FIXME: Reading of gzip'd abi files on the GitHub runners stop
170+
# working some time in March of 2021, likely due to a change in the
171+
# runner's environment.
172+
abi-compliance-checker $EXTRA_ARGS -l libLLVM.so -old build-baseline/*.abi -new build-latest/*.abi || test "${{ needs.abi-dump-setup.outputs.ABI_HEADERS }}" = "llvm-c"
171173
- name: Upload ABI Comparison
172174
if: always()
173175
uses: actions/upload-artifact@v1

0 commit comments

Comments
 (0)