Skip to content

Commit acc4d3c

Browse files
authored
tw/ldd-check cleanup batch 32 (#47190)
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/47190/checks?check_run_id=39038070520
1 parent d2e8466 commit acc4d3c

15 files changed

+15
-61
lines changed

erlang-26.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,4 @@ test:
101101
erlc hello.erl
102102
103103
erl -noshell -pa . -eval "hello:hello_wolfi()." -s init stop
104-
- uses: test/ldd-check
105-
with:
106-
packages: ${{package.name}}
104+
- uses: test/tw/ldd-check

erlang-27.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,4 @@ test:
112112
erlc hello.erl
113113
114114
erl -noshell -pa . -eval "hello:hello_wolfi()." -s init stop
115-
- uses: test/ldd-check
116-
with:
117-
packages: ${{package.name}}
115+
- uses: test/tw/ldd-check

eudev.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,7 @@ subpackages:
8181
mv ${{targets.destdir}}/usr/lib/libudev.so.* ${{targets.subpkgdir}}/usr/lib/
8282
test:
8383
pipeline:
84-
- uses: test/ldd-check
85-
with:
86-
packages: $(basename ${{targets.contextdir}})
84+
- uses: test/tw/ldd-check
8785
description: Dynamic library to access udev device information
8886

8987
- name: eudev-netifnames

execline.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -71,5 +71,3 @@ test:
7171
eltest --help
7272
withstdinas help
7373
- uses: test/tw/ldd-check
74-
with:
75-
packages: execline

expat.yaml

+2-8
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ subpackages:
4242
pipeline:
4343
- uses: test/pkgconf
4444
- uses: test/tw/ldd-check
45-
with:
46-
packages: expat-dev
4745

4846
- name: "libexpat1"
4947
description: "libexpat shared library"
@@ -53,9 +51,7 @@ subpackages:
5351
mv "${{targets.destdir}}"/usr/lib "${{targets.subpkgdir}}"/usr/
5452
test:
5553
pipeline:
56-
- uses: test/ldd-check
57-
with:
58-
packages: libexpat1
54+
- uses: test/tw/ldd-check
5955

6056
- name: expat-doc
6157
description: expat docs
@@ -112,9 +108,7 @@ test:
112108
113109
gcc -o test test.c -lexpat
114110
./test
115-
- uses: test/ldd-check
116-
with:
117-
packages: ${{package.name}}
111+
- uses: test/tw/ldd-check
118112
- name: "Verify XML parsing functionality"
119113
runs: |
120114
cat > test.xml << EOF

falco.yaml

+1-5
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,6 @@ subpackages:
142142
pipeline:
143143
- uses: test/pkgconf
144144
- uses: test/tw/ldd-check
145-
with:
146-
packages: falco-dev
147145

148146
update:
149147
enabled: true
@@ -215,6 +213,4 @@ test:
215213
- name: "Check ignored events"
216214
runs: |
217215
falco -i
218-
- uses: test/ldd-check
219-
with:
220-
packages: ${{package.name}}
216+
- uses: test/tw/ldd-check

ffmpeg.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,6 @@ subpackages:
146146
pipeline:
147147
- uses: test/pkgconf
148148
- uses: test/tw/ldd-check
149-
with:
150-
packages: ffmpeg-dev
151149

152150
- name: ffmpeg-doc
153151
pipeline:

fftw.yaml

+3-9
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,7 @@ subpackages:
102102
mv "${{targets.destdir}}"/usr/lib/libfftw3f*.so* "${{targets.subpkgdir}}"/usr/lib/
103103
test:
104104
pipeline:
105-
- uses: test/ldd-check
106-
with:
107-
packages: $(basename ${{targets.contextdir}})
105+
- uses: test/tw/ldd-check
108106

109107
- name: fftw-long-double-libs
110108
pipeline:
@@ -113,9 +111,7 @@ subpackages:
113111
mv "${{targets.destdir}}"/usr/lib/libfftw3l*.so* "${{targets.subpkgdir}}"/usr/lib/
114112
test:
115113
pipeline:
116-
- uses: test/ldd-check
117-
with:
118-
packages: $(basename ${{targets.contextdir}})
114+
- uses: test/tw/ldd-check
119115

120116
- name: fftw-double-libs
121117
pipeline:
@@ -124,9 +120,7 @@ subpackages:
124120
mv "${{targets.destdir}}"/usr/lib/libfftw3*.so* "${{targets.subpkgdir}}"/usr/lib/
125121
test:
126122
pipeline:
127-
- uses: test/ldd-check
128-
with:
129-
packages: $(basename ${{targets.contextdir}})
123+
- uses: test/tw/ldd-check
130124

131125
update:
132126
release-monitor:

file.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,7 @@ subpackages:
7373
mv "${{targets.destdir}}"/usr/share/misc "${{targets.subpkgdir}}"/usr/share
7474
test:
7575
pipeline:
76-
- uses: test/ldd-check
77-
with:
78-
packages: $(basename ${{targets.contextdir}})
76+
- uses: test/tw/ldd-check
7977

8078
- name: "file-doc"
8179
description: "file documentation"

flac.yaml

+2-6
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,7 @@ subpackages:
6464
mv ${{targets.destdir}}/usr/lib/libFLAC.so.* ${{targets.subpkgdir}}/usr/lib
6565
test:
6666
pipeline:
67-
- uses: test/ldd-check
68-
with:
69-
packages: $(basename ${{targets.contextdir}})
67+
- uses: test/tw/ldd-check
7068

7169
- name: libflac++
7270
pipeline:
@@ -75,9 +73,7 @@ subpackages:
7573
mv ${{targets.destdir}}/usr/lib/libFLAC++.so.* ${{targets.subpkgdir}}/usr/lib
7674
test:
7775
pipeline:
78-
- uses: test/ldd-check
79-
with:
80-
packages: $(basename ${{targets.contextdir}})
76+
- uses: test/tw/ldd-check
8177

8278
- name: flac-doc
8379
pipeline:

flex.yaml

+1-5
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ subpackages:
5757
test:
5858
pipeline:
5959
- uses: test/tw/ldd-check
60-
with:
61-
packages: flex-dev
6260

6361
- name: "libfl2"
6462
description: "flex scanner library"
@@ -68,9 +66,7 @@ subpackages:
6866
mv "${{targets.destdir}}"/usr/lib/libfl.so* "${{targets.subpkgdir}}"/usr/lib
6967
test:
7068
pipeline:
71-
- uses: test/ldd-check
72-
with:
73-
packages: $(basename ${{targets.contextdir}})
69+
- uses: test/tw/ldd-check
7470

7571
- name: flex-doc
7672
description: flex docs

fluent-bit-3.2.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -126,5 +126,3 @@ test:
126126
fluent-bit --help
127127
luajit -v
128128
- uses: test/tw/ldd-check
129-
with:
130-
packages: ${{package.name}}

fluent-bit-plugin-loki.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,7 @@ test:
7373
done
7474
echo "Timeout: 'Starting fluent-bit-go-loki' not found in logs"
7575
exit 1
76-
- uses: test/ldd-check
77-
with:
78-
packages: ${{package.name}}
76+
- uses: test/tw/ldd-check
7977

8078
update:
8179
enabled: true

fmt.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -69,5 +69,3 @@ test:
6969
g++ -o test_fmt test_fmt.cc -lfmt
7070
./test_fmt |grep "hello world"
7171
- uses: test/tw/ldd-check
72-
with:
73-
packages: fmt

fontconfig.yaml

+1-5
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,7 @@ subpackages:
8686
mv "${{targets.destdir}}"/usr/lib/libfontconfig.so.* "${{targets.subpkgdir}}"/usr/lib
8787
test:
8888
pipeline:
89-
- uses: test/ldd-check
90-
with:
91-
packages: $(basename ${{targets.contextdir}})
89+
- uses: test/tw/ldd-check
9290

9391
- name: fontconfig-dev
9492
pipeline:
@@ -98,8 +96,6 @@ subpackages:
9896
pipeline:
9997
- uses: test/pkgconf
10098
- uses: test/tw/ldd-check
101-
with:
102-
packages: fontconfig-dev
10399

104100
update:
105101
enabled: true

0 commit comments

Comments
 (0)