Skip to content

Commit a3e73b5

Browse files
authored
tw/ldd-check cleanup batch 31 (#47189)
This cleans up use of ldd-check, replacing test/ldd-check with test/tw/ldd-check and dropping the defaults where applicable. tests passed at https://github.com/wolfi-dev/os/pull/47189/checks?check_run_id=39038043831
1 parent 6b1d787 commit a3e73b5

15 files changed

+20
-74
lines changed

fontforge.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -171,5 +171,3 @@ test:
171171
sfddiff --help
172172
woff --help
173173
- uses: test/tw/ldd-check
174-
with:
175-
packages: fontforge

freetds.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ subpackages:
6161
test:
6262
pipeline:
6363
- uses: test/tw/ldd-check
64-
with:
65-
packages: freetds-dev
6664

6765
- name: freetds-doc
6866
description: freetds documentation
@@ -92,8 +90,6 @@ test:
9290
tsql -C
9391
fisql -v
9492
- uses: test/tw/ldd-check
95-
with:
96-
packages: freetds
9793
- name: Verify tsql config
9894
runs: |
9995
tsql -C | grep -q -E "iconv library:\s+yes"

frr-10.2.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -118,5 +118,3 @@ test:
118118
/usr/lib/frr/bgpd --version | grep ${{package.version}}
119119
/usr/lib/frr/bfdd --version | grep ${{package.version}}
120120
- uses: test/tw/ldd-check
121-
with:
122-
packages: frr-10.2

fuse2.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -113,5 +113,3 @@ test:
113113
- runs: |
114114
fusermount --version
115115
- uses: test/tw/ldd-check
116-
with:
117-
packages: fuse2

fuse3.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,7 @@ subpackages:
8686
description: fuse3 libs
8787
test:
8888
pipeline:
89-
- uses: test/ldd-check
90-
with:
91-
packages: fuse3-libs
89+
- uses: test/tw/ldd-check
9290

9391
update:
9492
enabled: true

gawk.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,4 @@ test:
5050
gawk --help
5151
gawk-5.3.1 --help
5252
gawkbug --help
53-
- uses: test/ldd-check
54-
with:
55-
packages: ${{package.name}}
53+
- uses: test/tw/ldd-check

gcc-11.yaml

+2-8
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,7 @@ subpackages:
168168
no-provides: true
169169
test:
170170
pipeline:
171-
- uses: test/ldd-check
172-
with:
173-
packages: $(basename ${{targets.contextdir}})
171+
- uses: test/tw/ldd-check
174172

175173
- name: 'libstdc++-11-dev'
176174
dependencies:
@@ -191,9 +189,7 @@ subpackages:
191189
"${{targets.subpkgdir}}"/usr/share/gcc-${{vars.major-version}}/python/libstdcxx/
192190
test:
193191
pipeline:
194-
- uses: test/ldd-check
195-
with:
196-
packages: $(basename ${{targets.contextdir}})
192+
- uses: test/tw/ldd-check
197193

198194
- name: 'gcc-11-default'
199195
description: 'Use GCC 11 as system gcc'
@@ -279,8 +275,6 @@ test:
279275
lto-dump-11 --version
280276
lto-dump-11 --help
281277
- uses: test/tw/ldd-check
282-
with:
283-
packages: gcc-11
284278
- name: hello world c
285279
runs: |
286280
cat >hello.c <<"EOF"

gcc-12.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -300,9 +300,7 @@ test:
300300
- uses: test/compiler-hardening-check
301301
with:
302302
cc: gcc-12
303-
- uses: test/ldd-check
304-
with:
305-
packages: ${{package.name}}
303+
- uses: test/tw/ldd-check
306304

307305
update:
308306
enabled: false

gcc-13.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -294,9 +294,7 @@ test:
294294
- uses: test/compiler-hardening-check
295295
with:
296296
cc: gcc-13
297-
- uses: test/ldd-check
298-
with:
299-
packages: ${{package.name}}
297+
- uses: test/tw/ldd-check
300298

301299
update:
302300
enabled: false

gcc-6.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,4 @@ test:
331331
gcov-tool-6.5 --help
332332
# Will fail https://github.com/wolfi-dev/os/issues/34009
333333
# - uses: test/pkgconf
334-
- uses: test/ldd-check
335-
with:
336-
packages: ${{package.name}}
334+
- uses: test/tw/ldd-check

gcc.yaml

+9-27
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,7 @@ subpackages:
162162
mv "${{targets.destdir}}"/usr/lib/*++.so.* "${{targets.subpkgdir}}"/usr/lib/
163163
test:
164164
pipeline:
165-
- uses: test/ldd-check
166-
with:
167-
packages: libstdc++
165+
- uses: test/tw/ldd-check
168166

169167
- name: 'libstdc++-dev'
170168
pipeline:
@@ -187,9 +185,7 @@ subpackages:
187185
mv "${{targets.destdir}}"/usr/lib/libquadmath.so.* "${{targets.subpkgdir}}"/usr/lib/
188186
test:
189187
pipeline:
190-
- uses: test/ldd-check
191-
with:
192-
packages: libquadmath
188+
- uses: test/tw/ldd-check
193189

194190
- name: "libgfortran"
195191
description: "Fortran runtime library provided by GCC"
@@ -199,9 +195,7 @@ subpackages:
199195
mv "${{targets.destdir}}"/usr/lib/libgfortran.so.* "${{targets.subpkgdir}}"/usr/lib/
200196
test:
201197
pipeline:
202-
- uses: test/ldd-check
203-
with:
204-
packages: libgfortran
198+
- uses: test/tw/ldd-check
205199

206200
- name: "gfortran"
207201
description: "GNU Fortran Compiler"
@@ -238,9 +232,7 @@ subpackages:
238232
mv "${{targets.destdir}}"/usr/lib/libgccjit.so.* "${{targets.subpkgdir}}"/usr/lib/
239233
test:
240234
pipeline:
241-
- uses: test/ldd-check
242-
with:
243-
packages: libgccjit
235+
- uses: test/tw/ldd-check
244236

245237
- name: "libgccjit-dev"
246238
description: "GCC JIT library headers"
@@ -267,9 +259,7 @@ subpackages:
267259
mv "${{targets.destdir}}"/usr/lib/libgomp.so.* "${{targets.subpkgdir}}"/usr/lib/
268260
test:
269261
pipeline:
270-
- uses: test/ldd-check
271-
with:
272-
packages: libgomp
262+
- uses: test/tw/ldd-check
273263

274264
- name: "libgcc"
275265
description: "GCC runtime library"
@@ -279,9 +269,7 @@ subpackages:
279269
mv "${{targets.destdir}}"/usr/lib/libgcc_s.so.* "${{targets.subpkgdir}}"/usr/lib/
280270
test:
281271
pipeline:
282-
- uses: test/ldd-check
283-
with:
284-
packages: libgcc
272+
- uses: test/tw/ldd-check
285273

286274
- name: "libatomic"
287275
description: "GCC atomic library"
@@ -291,9 +279,7 @@ subpackages:
291279
mv "${{targets.destdir}}"/usr/lib/libatomic.so.* "${{targets.subpkgdir}}"/usr/lib/
292280
test:
293281
pipeline:
294-
- uses: test/ldd-check
295-
with:
296-
packages: libatomic
282+
- uses: test/tw/ldd-check
297283

298284
- name: "libgo"
299285
description: "GCC go runtime library"
@@ -303,9 +289,7 @@ subpackages:
303289
mv "${{targets.destdir}}"/usr/lib/libgo.so.* "${{targets.subpkgdir}}"/usr/lib/
304290
test:
305291
pipeline:
306-
- uses: test/ldd-check
307-
with:
308-
packages: libgo
292+
- uses: test/tw/ldd-check
309293

310294
- name: "gcc-go"
311295
description: "GCC go compiler"
@@ -412,9 +396,7 @@ test:
412396
- uses: test/compiler-hardening-check
413397
with:
414398
cc: gcc
415-
- uses: test/ldd-check
416-
with:
417-
packages: ${{package.name}}
399+
- uses: test/tw/ldd-check
418400

419401
update:
420402
enabled: true

gd.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,7 @@ subpackages:
7171
mv ${{targets.destdir}}/usr/lib/libgd.so.* ${{targets.subpkgdir}}/usr/lib/
7272
test:
7373
pipeline:
74-
- uses: test/ldd-check
75-
with:
76-
packages: $(basename ${{targets.contextdir}})
74+
- uses: test/tw/ldd-check
7775

7876
update:
7977
enabled: true

gdb.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,4 @@ test:
7373
gdbserver --version
7474
gdb --help
7575
gdbserver --help
76-
- uses: test/ldd-check
77-
with:
78-
packages: ${{package.name}}
76+
- uses: test/tw/ldd-check

gdbm.yaml

+1-5
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ subpackages:
4444
test:
4545
pipeline:
4646
- uses: test/tw/ldd-check
47-
with:
48-
packages: gdbm-dev
4947

5048
- name: gdbm-doc
5149
description: gdbm docs
@@ -71,6 +69,4 @@ test:
7169
gdbm_dump --help
7270
gdbm_load --help
7371
gdbmtool --help
74-
- uses: test/ldd-check
75-
with:
76-
packages: ${{package.name}}
72+
- uses: test/tw/ldd-check

gdk-pixbuf.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,4 @@ test:
9292
gdk-pixbuf-csource --help
9393
gdk-pixbuf-pixdata --help
9494
gdk-pixbuf-query-loaders --help
95-
- uses: test/ldd-check
96-
with:
97-
packages: ${{package.name}}
95+
- uses: test/tw/ldd-check

0 commit comments

Comments
 (0)